From: Koen Kooi <koen@openembedded.org>
Date: Sun, 22 Feb 2009 10:09:34 +0000 (+0100)
Subject: rootfs_ipk bbclass: make ONLINE_PACKAGE_MANAGEMENT work on non task-base images as... 
X-Git-Tag: Release-2010-05/1~3974^2~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93e360f072cd879097c1c54e7da4407094d682fa;p=openembedded.git

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
---

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index e752449305..10a532e0a9 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