rootfs_ipk.bbclass: Don't generate the arch.conf file, provide this as a packaged...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index 66d3712b8d32ae518cc1f980f7ff4ab99cf5582e..bf18667f7a47fa431684170b47e18ebf3a04c3d9 100644 (file)
--- 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}