[oe-commits] Koen Kooi : rootfs_ipk bbclass: make ONLINE_PACKAGE_MANAGEMENT work on non task-base images as well

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 93e360f072cd879097c1c54e7da4407094d682fa
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=93e360f072cd879097c1c54e7da4407094d682fa

Author: Koen Kooi <koen at openembedded.org>
Date:   Sun Feb 22 11:09:34 2009 +0100

rootfs_ipk bbclass: make ONLINE_PACKAGE_MANAGEMENT work on non task-base images as well
* This fixes the "image broken due to not running postinsts because opkg* isn't installed" type of bugs

---

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

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index e752449..10a532e 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -21,7 +21,10 @@ ONLINE_PACKAGE_MANAGEMENT ?= "full"
 # Which packages to not install on the basis of a recommendation
 BAD_RECOMMENDATIONS ?= ""
 
-DISTRO_EXTRA_RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "opkg opkg-collateral", d)}"
+IPKG_VARIANT ?= "opkg"
+
+RDEPENDS += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
+PACKAGE_INSTALL += "${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${IPKG_VARIANT} opkg-collateral", d)}"
 
 fakeroot rootfs_ipk_do_rootfs () {
 	set -x