From 55845cdac649c66bb4ca72b81313e0a443ec40e1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 9 Oct 2010 10:44:36 +0200 Subject: [PATCH] util-linux-ng: fix DEPENDS * it picks up pam from staging if it's built, so add it to DEPENDS with DISTRO_FEATURES guard * remove bogus IMAGE_FEATURE check since u-l-ng is supposed to be used in images with or without udev Recipes are not allowed to make compile decisions based on the image that's going to get built, since that breaks package management severely. More to the point: What happens when you do 'bitbake util-linux-ng' and later do 'bitbake foo-image' where foo-image sets a different IMAGE_DEV_MANAGER? Signed-off-by: Koen Kooi --- recipes/util-linux-ng/util-linux-ng.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc index bba5dad442..993742f419 100644 --- a/recipes/util-linux-ng/util-linux-ng.inc +++ b/recipes/util-linux-ng/util-linux-ng.inc @@ -1,14 +1,14 @@ DESCRIPTION = "Util-linux-ng is a suite of essential utilities for any Linux system." SECTION = "base" LICENSE = "GPL" -DEPENDS = "${@base_conditional('IMAGE_DEV_MANAGER', 'udev', 'udev', '', d)} zlib ncurses virtual/libintl" +DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} udev zlib ncurses virtual/libintl" DEPENDS_virtclass-native = "zlib-native ncurses-native lzo-native gettext-native" inherit autotools gettext DEFAULT_PREFERENCE = "-1" -INC_PR = "r31" +INC_PR = "r32" # allows for a release candidate RC ?= "" -- 2.39.5