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 <koen@openembedded.org>

diff --git a/recipes/util-linux-ng/util-linux-ng.inc b/recipes/util-linux-ng/util-linux-ng.inc
index bba5dad..993742f 100644 (file)
--- 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 ?= ""