diff options
| author | Phil Blundell <philb@gnu.org> | 2011-08-30 17:27:13 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 19:58:51 +0100 |
| commit | 9864b0a8253922e044f61506a4a8e9064aac2bd7 (patch) | |
| tree | b9c918be780d26fb6229bad11d0dc3ab6982c475 /meta/recipes-support/libcap | |
| parent | 48ec20d1331eb665d9fc1a06bdb1ea79e4513159 (diff) | |
| download | openembedded-core-9864b0a8253922e044f61506a4a8e9064aac2bd7.tar.gz openembedded-core-9864b0a8253922e044f61506a4a8e9064aac2bd7.tar.bz2 openembedded-core-9864b0a8253922e044f61506a4a8e9064aac2bd7.zip | |
libcap: only enable pam if DISTRO_FEATURES requests it
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap')
| -rw-r--r-- | meta/recipes-support/libcap/libcap.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-support/libcap/libcap_2.22.bb | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index 67f7579e1d..350653071e 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc @@ -5,7 +5,8 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/" LICENSE = "BSD | GPLv2" LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" -DEPENDS = "libpam attr perl-native-runtime" +DEPENDS = "attr perl-native-runtime" +DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" # attr and pam are disabled by EXTRA_OEMAKE_virtclass-native DEPENDS_virtclass-native = "perl-native-runtime" @@ -20,7 +21,7 @@ do_configure() { sed -e 's,BUILD_CFLAGS ?=,BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules } -EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=yes INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" +EXTRA_OEMAKE = "LIBATTR=yes PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no" EXTRA_OEMAKE_virtclass-native = "LIBATTR=no PAM_CAP=no INDENT= " EXTRA_OEMAKE += " lib=${@os.path.basename('${libdir}')}" diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb index bb49c031c6..a31ba3fadd 100644 --- a/meta/recipes-support/libcap/libcap_2.22.bb +++ b/meta/recipes-support/libcap/libcap_2.22.bb @@ -1,6 +1,6 @@ require libcap.inc -PR = "r0" +PR = "r1" SRC_URI[md5sum] = "ce64058bdb3f086ddbfca8ce6c919845" SRC_URI[sha256sum] = "73ebbd4877b5f69dd28b72098e510c5b318bc480f8201c4061ac98b78c04050f" |