[oe] [PATCH] Revert "rootfs_ipk.bbclass: install the package manager in a separate pass from the other packages"

[Bernhard Reutner-Fischer]

On Thu, Aug 05, 2010 at 01:10:13PM +0200, Martin Jansa wrote:
>This reverts commit acc720fa80227d08fd15764117e0c34e2387e804.

I'd suggest to fix it instead, like put it into the properly guarded
block:

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 7c85aae..4256945 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -63,7 +63,6 @@ fakeroot rootfs_ipk_do_rootfs () {
 			opkg-cl ${IPKG_ARGS} install $i 2>&1 || true
 		done > ${T}/log.do_rootfs-attemptonly.${PID}
 	fi
-	opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL_PKGMGR}
 
 	export D=${IMAGE_ROOTFS}
 	export OFFLINE_ROOT=${IMAGE_ROOTFS}
@@ -71,6 +70,7 @@ fakeroot rootfs_ipk_do_rootfs () {
 	export OPKG_OFFLINE_ROOT=${IPKG_OFFLINE_ROOT}
 	
 	if [ "${ONLINE_PACKAGE_MANAGEMENT}" != "none" ]; then
+		opkg-cl ${IPKG_ARGS} install ${PACKAGE_INSTALL_PKGMGR}
         	mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/opkg/
 		grep "^arch" ${IPKGCONF_TARGET} >${IMAGE_ROOTFS}${sysconfdir}/opkg/arch.conf
 	fi