diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
| commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
| tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-support/libcap | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.tar.gz | |
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc index fef700a629..08f4cfedde 100644 --- a/meta/recipes-support/libcap/libcap.inc +++ b/meta/recipes-support/libcap/libcap.inc | |||
| @@ -6,7 +6,7 @@ LICENSE = "BSD | GPLv2" | |||
| 6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" | 6 | LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" |
| 7 | 7 | ||
| 8 | DEPENDS = "attr perl-native-runtime" | 8 | DEPENDS = "attr perl-native-runtime" |
| 9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" | 9 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" |
| 10 | # attr and pam are disabled by EXTRA_OEMAKE_class-native | 10 | # attr and pam are disabled by EXTRA_OEMAKE_class-native |
| 11 | DEPENDS_class-native = "perl-native-runtime" | 11 | DEPENDS_class-native = "perl-native-runtime" |
| 12 | 12 | ||
| @@ -31,7 +31,7 @@ do_configure() { | |||
| 31 | 31 | ||
| 32 | EXTRA_OEMAKE = " \ | 32 | EXTRA_OEMAKE = " \ |
| 33 | LIBATTR=yes \ | 33 | LIBATTR=yes \ |
| 34 | PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ | 34 | PAM_CAP=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ |
| 35 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ | 35 | INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ |
| 36 | lib=${@os.path.basename('${libdir}')} \ | 36 | lib=${@os.path.basename('${libdir}')} \ |
| 37 | " | 37 | " |
