From 93e360f072cd879097c1c54e7da4407094d682fa Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Feb 2009 11:09:34 +0100 Subject: 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 file changed, 4 insertions(+), 1 deletion(-) (limited to 'classes/rootfs_ipk.bbclass') 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 -- cgit v1.2.3 From aff23a2028d1b48d8e9a26c4656ae48cd0016cfc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 22 Feb 2009 20:05:12 +0100 Subject: image.bbclass: install stuff listed in IMAGE_INSTALL as well rootfs_ipk: task-boot change fixes --- classes/rootfs_ipk.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'classes/rootfs_ipk.bbclass') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 10a532e0a9..f5714bd1a3 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -23,8 +23,8 @@ BAD_RECOMMENDATIONS ?= "" 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)}" +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)}" fakeroot rootfs_ipk_do_rootfs () { set -x -- cgit v1.2.3