From patchwork Thu May  5 07:57:16 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [12/26] Remove machine-specific metadata for machines no longer in
	oe-core
Date: Thu, 05 May 2011 07:57:16 -0000
From: Saul Wold <sgw@linux.intel.com>
X-Patchwork-Id: 3227
Message-Id: <7f6d6ff09b1e1f426a7280dcdd8e4a7d4a1aab57.1304581770.git.sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org,bruce.ashfield@windriver.com
Cc: Kyle McMartin <kyle@redhat.com>, Greg Kroah-Hartman <gregkh@suse.de>,
	Paul Eggleton <paul.eggleton@linux.intel.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Kang Kai <kai.kang@windriver.com>, Thomas Meyer <thomas@m3y3r.de>

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