From 1a7cff6077b770083062952ef6f6f7517bfd2c07 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 18 Apr 2007 21:22:03 +0000 Subject: classes: Add support for intertask dependencies to be specified, needed for correct operation with bitbake 1.8.x. Old behaviour is maintained in a special legacy anonymous function in base.bbclass. The patch is an improved version of the one discussed on the mailing list. --- classes/rootfs_ipk.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'classes/rootfs_ipk.bbclass') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index fdd42ee429..26eca34da9 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -5,12 +5,11 @@ # See image.bbclass for a usage of this. # -DEPENDS_prepend="ipkg-native ipkg-utils-native fakeroot-native " -DEPENDS_append=" ${EXTRA_IMAGEDEPENDS}" -RDEPENDS += "ipkg ipkg-collateral" +do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" +RDEPENDS += "ipkg ipkg-collateral" PACKAGE_INSTALL += "ipkg ipkg-collateral" rootfs_ipk_do_indexes () { -- cgit v1.2.3 From 03e9eca55c12eec52c8b9888d103a8d2dd2b1c86 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 10 Jun 2007 22:32:49 +0000 Subject: rootfs_ipk.bbclass: Add new option, PACKAGE_INSTALL_NO_DEPS. If set to 1, list of packages in PACKAGE_INSTALL installed as is, without any dependencies. * Useful for initrds, etc. * Closes #2469. --- classes/rootfs_ipk.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes/rootfs_ipk.bbclass') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 26eca34da9..210563aed1 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -7,10 +7,11 @@ do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" -IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS}" +IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" RDEPENDS += "ipkg ipkg-collateral" PACKAGE_INSTALL += "ipkg ipkg-collateral" +PACKAGE_INSTALL_NO_DEPS ?= "0" rootfs_ipk_do_indexes () { set -x -- cgit v1.2.3 From 91b1ac83d75dffc0e2edbc8e454bb96d250a968d Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 24 Jun 2007 11:04:21 +0000 Subject: rootfs_ipk.bbclass: Do not hardcode ipkg RDEPENDency. * Instead, ad dit to DISTRO_EXTRA_RDEPENDS, so full-fledged images bsed on task-base will get it automagically, while adhoc images (initrds, etc.) can leave it out. * This corresponds with how dpkg is handled, and how it is done in poky. * Closes #2484. --- classes/rootfs_ipk.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'classes/rootfs_ipk.bbclass') diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass index 210563aed1..75c85e8f3d 100644 --- a/classes/rootfs_ipk.bbclass +++ b/classes/rootfs_ipk.bbclass @@ -9,8 +9,7 @@ do_rootfs[depends] += "ipkg-native:do_populate_staging ipkg-utils-native:do_popu IPKG_ARGS = "-f ${T}/ipkg.conf -o ${IMAGE_ROOTFS} ${@base_conditional("PACKAGE_INSTALL_NO_DEPS", "1", "-nodeps", "", d)}" -RDEPENDS += "ipkg ipkg-collateral" -PACKAGE_INSTALL += "ipkg ipkg-collateral" +DISTRO_EXTRA_RDEPENDS += " ipkg ipkg-collateral " PACKAGE_INSTALL_NO_DEPS ?= "0" rootfs_ipk_do_indexes () { -- cgit v1.2.3