From efd00048e33f5ef1245168dc08309e4f1040560e Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 15 Jul 2009 12:57:10 +0100
Subject: rootfs_ipk.bbclass: Don't generate the arch.conf file, provide this
 as a packaged file in future

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/classes/rootfs_ipk.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'meta/classes')

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 66d3712b8..bf18667f7 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -5,7 +5,7 @@
 # See image.bbclass for a usage of this.
 #
 
-ROOTFS_PKGMANAGE = "opkg opkg-collateral"
+ROOTFS_PKGMANAGE = "opkg opkg-collateral ${EXTRAOPKGCONFIG}"
 ROOTFS_PKGMANAGE_BOOTSTRAP  = "run-postinsts"
 
 do_rootfs[depends] += "opkg-native:do_populate_staging opkg-utils-native:do_populate_staging"
@@ -51,8 +51,9 @@ fakeroot rootfs_ipk_do_rootfs () {
 	export IPKG_OFFLINE_ROOT=${IMAGE_ROOTFS}
 	export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
 
-	mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
-	grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf
+	# Distro specific packages should create this
+	#mkdir -p ${IMAGE_ROOTFS}/etc/opkg/
+	#grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}/etc/opkg/arch.conf
 
 	${OPKG_POSTPROCESS_COMMANDS}
 	${ROOTFS_POSTINSTALL_COMMAND}
-- 
cgit v1.2.3