summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-11-06 16:19:26 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-09 10:21:20 +0000
commit78f6f533bbdb4997a3a86ab8f62054c5d13c0d3f (patch)
treeead2af032cf146acb68d856a8d9a6df7ce8bc822
parent0ee5eb295c89a797fc505fc3cca2bbc5ff88fff0 (diff)
downloadpoky-78f6f533bbdb4997a3a86ab8f62054c5d13c0d3f.tar.gz
libcap: Upgrade to 2.24
Tarballs moved to kernel.org Deleted upstream'ed patch merged minimal .bb with .inc Check for security dir before moving it when pam is enabled. (From OE-Core rev: 73f2b69b17e5364388faf0f31275c3c69fb31030) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch39
-rw-r--r--meta/recipes-support/libcap/libcap_2.22.bb6
-rw-r--r--meta/recipes-support/libcap/libcap_2.24.bb (renamed from meta/recipes-support/libcap/libcap.inc)12
3 files changed, 7 insertions, 50 deletions
diff --git a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch b/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
deleted file mode 100644
index a5571883d3..0000000000
--- a/meta/recipes-support/libcap/libcap/fix-CAP_LAST_CAP.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1fix CAP_LAST_CAP
2
3Upstream-Status: pending
4
5Two new capability CAP_BLOCK_SUSPEND and CAP_WAKE_ALARM have been added into
6kernel, but libcap did not update them.
7Once libcap uses its capability.h (the default value of KERNEL_HEADERS), and
8application always use capability.h from kernel, that will make cap_get_flag
9return wrong value.
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 libcap/include/linux/capability.h | 10 +++++++++-
14 1 file changed, 9 insertions(+), 1 deletion(-)
15
16diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
17index 4924f2a..57026be 100644
18--- a/libcap/include/linux/capability.h
19+++ b/libcap/include/linux/capability.h
20@@ -360,7 +360,15 @@ struct cpu_vfs_cap_data {
21 CAP_SYS_ADMIN is not acceptable anymore. */
22 #define CAP_SYSLOG 34
23
24-#define CAP_LAST_CAP CAP_SYSLOG
25+/* Allow triggering something that will wake the system */
26+
27+#define CAP_WAKE_ALARM 35
28+
29+/* Allow preventing system suspends */
30+
31+#define CAP_BLOCK_SUSPEND 36
32+
33+#define CAP_LAST_CAP CAP_BLOCK_SUSPEND
34
35 #define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
36
37--
381.7.10.4
39
diff --git a/meta/recipes-support/libcap/libcap_2.22.bb b/meta/recipes-support/libcap/libcap_2.22.bb
deleted file mode 100644
index a989bb6a6b..0000000000
--- a/meta/recipes-support/libcap/libcap_2.22.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require libcap.inc
2
3PR = "r6"
4
5SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
6SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap_2.24.bb
index 0e28ea04a9..75cf5d415d 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap_2.24.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
7 7
8DEPENDS = "perl-native-runtime" 8DEPENDS = "perl-native-runtime"
9 9
10SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \ 10SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
11 file://fix-CAP_LAST_CAP.patch"
12 11
13PR = "r1" 12SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80"
13SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65"
14 14
15inherit lib_package 15inherit lib_package
16 16
@@ -56,8 +56,10 @@ do_install_append() {
56 # Move the library to base_libdir 56 # Move the library to base_libdir
57 install -d ${D}${base_libdir} 57 install -d ${D}${base_libdir}
58 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then 58 if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
59 mv ${D}${libdir}/* ${D}${base_libdir} 59 mv ${D}${libdir}/libcap* ${D}${base_libdir}
60 rmdir ${D}${libdir} 60 if [ -d ${D}${libdir}/security ]; then
61 mv ${D}${libdir}/security ${D}${base_libdir}
62 fi
61 fi 63 fi
62} 64}
63 65