rootfs_ipk.bbclass: install the package manager in a separate pass from the other...

It seems that installing opkg/opkg-collateral blows away the configuration we
need to install more packages, so lets make that explicit by installing those
things last.

Signed-off-by: Chris Larson <chris_larson@mentor.com>

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 0303c54..57d3dcd 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -25,7 +25,7 @@ BAD_RECOMMENDATIONS ?= ""
 IPKG_VARIANT ?= "opkg"
 
 RDEPENDS_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
-PACKAGE_INSTALL_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
+PACKAGE_INSTALL_PKGMGR = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
 
 fakeroot rootfs_ipk_do_rootfs () {
        set -x
@@ -44,7 +44,6 @@ fakeroot rootfs_ipk_do_rootfs () {
                echo "Status: deinstall ok not-installed" >> $STATUS
                echo >> $STATUS
        done
-
        opkg-cl ${IPKG_ARGS} update
 
        # Uclibc builds don't provide this stuff...
@@ -59,6 +58,7 @@ fakeroot rootfs_ipk_do_rootfs () {
        if [ ! -z "${PACKAGE_INSTALL}" ]; then
                opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL}
        fi
+       opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL_PKGMGR}
 
        export D=${IMAGE_ROOTFS}
        export OFFLINE_ROOT=${IMAGE_ROOTFS}