summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-04-20 16:28:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-29 11:17:23 +0100
commitfd9d421d0e14b63eaac3ae8e8a49ef580528adbb (patch)
treec7bd151723ef6e2a0e414263cb9ccc4492b397bd
parent33f378ee3354ceffe26d6288098d8ef78f5677f2 (diff)
downloadpoky-fd9d421d0e14b63eaac3ae8e8a49ef580528adbb.tar.gz
libcap: drop obsolete attr PACKAGECONFIG option and libattr dependency
In the 2.25 release, libcap dropped its dependency on an external libattr library: https://git.kernel.org/pub/scm/linux/kernel/git/morgan/libcap.git/commit/?id=85f38a573fc47472ab792e813b6f6b6f0b1df112 (From OE-Core rev: 9ad941b512e3fcfd748d40b00d7d715d753c7b55) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libcap/libcap_2.25.bb4
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/recipes-support/libcap/libcap_2.25.bb b/meta/recipes-support/libcap/libcap_2.25.bb
index 26d7bf2a6e..0587e77e98 100644
--- a/meta/recipes-support/libcap/libcap_2.25.bb
+++ b/meta/recipes-support/libcap/libcap_2.25.bb
@@ -27,11 +27,9 @@ do_configure() {
27 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile 27 sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile
28} 28}
29 29
30PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ 30PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
31 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}"
32PACKAGECONFIG_class-native ??= "" 31PACKAGECONFIG_class-native ??= ""
33 32
34PACKAGECONFIG[attr] = "LIBATTR=yes,LIBATTR=no,attr"
35PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam" 33PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
36 34
37EXTRA_OEMAKE = " \ 35EXTRA_OEMAKE = " \