Patchwork [2/2] sysklogd.inc: Check for package-management in IMAGE_FEATURES

login
register
mail settings
Submitter Khem Raj
Date June 10, 2011, 12:57 a.m.
Message ID <1307667467-467-2-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/5619/
State New, archived
Headers show

Comments

Khem Raj - June 10, 2011, 12:57 a.m.
ONLINE_PACKAGE_MANAGEMENT does not exist on oe-core

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-extended/sysklogd/sysklogd.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Koen Kooi - June 10, 2011, 6:39 a.m.
Op 10 jun 2011, om 02:57 heeft Khem Raj het volgende geschreven:

> ONLINE_PACKAGE_MANAGEMENT does not exist on oe-core
> 
> Signed-off-by: Khem Raj <raj.khem@gmail.com>
> ---
> meta/recipes-extended/sysklogd/sysklogd.inc |    2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
> index f2b1c15..f6a56ec 100644
> --- a/meta/recipes-extended/sysklogd/sysklogd.inc
> +++ b/meta/recipes-extended/sysklogd/sysklogd.inc
> @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
> # syslog initscript is handled explicitly because order of
> # update-rc.d and update-alternatives is important (see below)
> DEPENDS_append = " update-rc.d update-rc.d-native"
> -RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
> +RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"

You can't do IMAGE_FEATURES in RDEPENDS, consider what happens when I build 2 images, one with package-management and one without. Phils changes to catch update-rc.d usage in the image* classes should be enough to fix this.

regards,

Koen
Phil Blundell - June 10, 2011, 2:17 p.m.
On Thu, 2011-06-09 at 17:57 -0700, Khem Raj wrote:
> -RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
> +RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"

This sort of thing shouldn't be necessary in oe-core.  See previous
discussions between me and Richard as to why IMAGE_FEATURES is not the
right thing, and code in package_ipk.bbclass which ought to be taking
care of it.  If you're using a different package manager then it should
be fairly straightforward to adapt that logic to suit.

You're right though the the reference to O_P_M is clearly wrong and
should be removed.  I'm not quite sure how that got in there in the
first place; must have been some oversight during patch review I guess.

p.

Patch

diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index f2b1c15..f6a56ec 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -14,7 +14,7 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b \
 # syslog initscript is handled explicitly because order of
 # update-rc.d and update-alternatives is important (see below)
 DEPENDS_append = " update-rc.d update-rc.d-native"
-RDEPENDS_${PN}_append = " ${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "update-rc.d", d)}"
+RDEPENDS_${PN}_append = " ${@oe.utils.contains("IMAGE_FEATURES", "package-management", "update-rc.d", "", d)}"
 
 SRC_URI = "http://www.infodrom.org/projects/sysklogd/download/sysklogd-${PV}.tar.gz \
            file://no-strip-install.patch \