summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-07-07 16:44:24 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-08 11:20:13 +0100
commit0a6dcf2f5b80dbd9d1a73e697dc463eee1c54068 (patch)
tree99af9da1e63861ea8cb6f75197a3bab369edcd23 /meta/recipes-support
parent42806c7c7b2024273ac249ff4be3c51f69a60aa7 (diff)
downloadpoky-0a6dcf2f5b80dbd9d1a73e697dc463eee1c54068.tar.gz
libcap: use PACKAGECONFIG for attr and pam configurations
Instead of hard-coding PAM/xattr on for target and off for native, slightly abuse PACKAGECONFIG to add options (and pass them to make in do_compile). (From OE-Core rev: 51540b64f62234c145fc32cfa3fbbaaebbeece08) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libcap/libcap.inc34
1 files changed, 18 insertions, 16 deletions
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index 08f4cfedde..a21420fd9b 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -5,10 +5,7 @@ HOMEPAGE = "http://sites.google.com/site/fullycapable/"
5LICENSE = "BSD | GPLv2" 5LICENSE = "BSD | GPLv2"
6LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" 6LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
7 7
8DEPENDS = "attr perl-native-runtime" 8DEPENDS = "perl-native-runtime"
9DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
10# attr and pam are disabled by EXTRA_OEMAKE_class-native
11DEPENDS_class-native = "perl-native-runtime"
12 9
13SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \ 10SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \
14 file://fix-CAP_LAST_CAP.patch" 11 file://fix-CAP_LAST_CAP.patch"
@@ -29,25 +26,30 @@ do_configure() {
29 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile 26 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile
30} 27}
31 28
32EXTRA_OEMAKE = " \ 29PACKAGECONFIG ??= "attr ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
33 LIBATTR=yes \ 30PACKAGECONFIG_class-native ??= ""
34 PAM_CAP=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ 31
35 INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ 32PACKAGECONFIG[attr] = "LIBATTR=yes,LIBATTR=no,attr"
36 lib=${@os.path.basename('${libdir}')} \ 33PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
37" 34
38EXTRA_OEMAKE_class-native = " \ 35EXTRA_OEMAKE += " \
39 LIBATTR=no \ 36 INDENT= \
40 PAM_CAP=no \
41 INDENT= \
42 lib=${@os.path.basename('${libdir}')} \ 37 lib=${@os.path.basename('${libdir}')} \
38 RAISE_SETFCAP=no \
43" 39"
44 40
41EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
42
45do_compile() { 43do_compile() {
46 oe_runmake 44 oe_runmake ${EXTRA_OECONF}
47} 45}
48 46
49do_install() { 47do_install() {
50 oe_runmake install DESTDIR="${D}" prefix="${prefix}" SBINDIR="${D}${sbindir}" 48 oe_runmake install \
49 ${EXTRA_OECONF} \
50 DESTDIR="${D}" \
51 prefix="${prefix}" \
52 SBINDIR="${D}${sbindir}"
51} 53}
52 54
53do_install_append() { 55do_install_append() {