Patchwork [12/26] Remove machine-specific metadata for machines no longer in oe-core

login
register
mail settings
Submitter Saul Wold
Date May 5, 2011, 7:57 a.m.
Message ID <7f6d6ff09b1e1f426a7280dcdd8e4a7d4a1aab57.1304581770.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/3227/
State New, archived
Headers show

Comments

Saul Wold - May 5, 2011, 7:57 a.m.
From: Paul Eggleton <paul.eggleton@linux.intel.com>

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/recipes-core/base-files/base-files_3.0.14.bb |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)
Richard Purdie - May 5, 2011, 11:18 a.m.
On Thu, 2011-05-05 at 00:57 -0700, Saul Wold wrote:
> From: Paul Eggleton <paul.eggleton@linux.intel.com>
> 
> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
> ---
>  meta/recipes-core/base-files/base-files_3.0.14.bb |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
> index 4445081..c80faaa 100644
> --- a/meta/recipes-core/base-files/base-files_3.0.14.bb
> +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
> @@ -131,6 +131,25 @@ do_install_basefilesissue () {
>   	fi
>  }
>  
> +<<<<<<< HEAD
> +=======
> +do_install_append_nylon() {
> +	printf "" "" >${D}${sysconfdir}/resolv.conf
> +	rm -r ${D}/mnt/*
> +	rm -r ${D}/media
> +	rm -rf ${D}/tmp
> +	ln -sf /var/tmp ${D}/tmp
> +}
> +
> +do_install_append_slugos() {
> +	printf "" "" >${D}${sysconfdir}/resolv.conf
> +	rm -r ${D}/mnt/*
> +	rmdir ${D}/home/root
> +	install -m 0755 -d ${D}/root
> +	ln -s ../root ${D}/home/root
> +}
> +
> +>>>>>>> d67f12d... Remove machine-specific metadata for machines no longer in oe-core
>  do_install_append_linuxstdbase() {
>  	for d in ${dirs3755}; do
>                  install -m 0755 -d ${D}$d

Er, I didn't take this ;-)

Cheers,

Richard

Patch

diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb
index 4445081..c80faaa 100644
--- a/meta/recipes-core/base-files/base-files_3.0.14.bb
+++ b/meta/recipes-core/base-files/base-files_3.0.14.bb
@@ -131,6 +131,25 @@  do_install_basefilesissue () {
  	fi
 }
 
+<<<<<<< HEAD
+=======
+do_install_append_nylon() {
+	printf "" "" >${D}${sysconfdir}/resolv.conf
+	rm -r ${D}/mnt/*
+	rm -r ${D}/media
+	rm -rf ${D}/tmp
+	ln -sf /var/tmp ${D}/tmp
+}
+
+do_install_append_slugos() {
+	printf "" "" >${D}${sysconfdir}/resolv.conf
+	rm -r ${D}/mnt/*
+	rmdir ${D}/home/root
+	install -m 0755 -d ${D}/root
+	ln -s ../root ${D}/home/root
+}
+
+>>>>>>> d67f12d... Remove machine-specific metadata for machines no longer in oe-core
 do_install_append_linuxstdbase() {
 	for d in ${dirs3755}; do
                 install -m 0755 -d ${D}$d