aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2010-08-05 09:41:39 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2010-08-06 14:51:00 +0200
commita7cc4bc9a7e0643e2288d4213e1fb64b7a6e6169 (patch)
tree084b3e41cef22c4f2d268e768c5a707b05f1cb9f /classes
parentef6ef8a68a9a9c6eac5c165dca1f07096c86317c (diff)
downloadopenembedded-a7cc4bc9a7e0643e2288d4213e1fb64b7a6e6169.tar.gz
Revert "rootfs_ipk.bbclass: install the package manager in a separate pass from the other packages"
* This reverts commit acc720fa80227d08fd15764117e0c34e2387e804. * Graham already has a proper fix for this. * This breaks rootfs with ${ONLINE_PACKAGE_MANAGEMENT}" == "none" Conflicts: classes/rootfs_ipk.bbclass Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-By: Chris Larson <clarson@mvista.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/rootfs_ipk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 7c85aae5dc..db04fb6bfc 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}