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

[Martin Jansa]

This reverts commit acc720fa80227d08fd15764117e0c34e2387e804.

Conflicts:

	classes/rootfs_ipk.bbclass
---
 classes/rootfs_ipk.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 7c85aae..db04fb6 100644
--- 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_PKGMGR = " ${@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)}"
 
 fakeroot rootfs_ipk_do_rootfs () {
 	set -x
@@ -44,6 +44,7 @@ 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...
@@ -63,7 +64,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}
-- 
1.7.1.1