diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-08-03 16:55:40 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-08-03 17:11:40 -0700 |
| commit | acc720fa80227d08fd15764117e0c34e2387e804 (patch) | |
| tree | 2f54bbce7214f1dd047ff3d87f20f2d888a63e7d /classes/rootfs_ipk.bbclass | |
| parent | b0061845a60d7781f9287ae6955585485f5ba8e9 (diff) | |
rootfs_ipk.bbclass: install the package manager in a separate pass from the other packages
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>
Diffstat (limited to 'classes/rootfs_ipk.bbclass')
| -rw-r--r-- | 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 0303c54cc6..57d3dcdd05 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_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} |