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>
This commit is contained in:
parent
0ee5eb295c
commit
78f6f533bb
|
@ -1,39 +0,0 @@
|
|||
fix CAP_LAST_CAP
|
||||
|
||||
Upstream-Status: pending
|
||||
|
||||
Two new capability CAP_BLOCK_SUSPEND and CAP_WAKE_ALARM have been added into
|
||||
kernel, but libcap did not update them.
|
||||
Once libcap uses its capability.h (the default value of KERNEL_HEADERS), and
|
||||
application always use capability.h from kernel, that will make cap_get_flag
|
||||
return wrong value.
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
libcap/include/linux/capability.h | 10 +++++++++-
|
||||
1 file changed, 9 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
|
||||
index 4924f2a..57026be 100644
|
||||
--- a/libcap/include/linux/capability.h
|
||||
+++ b/libcap/include/linux/capability.h
|
||||
@@ -360,7 +360,15 @@ struct cpu_vfs_cap_data {
|
||||
CAP_SYS_ADMIN is not acceptable anymore. */
|
||||
#define CAP_SYSLOG 34
|
||||
|
||||
-#define CAP_LAST_CAP CAP_SYSLOG
|
||||
+/* Allow triggering something that will wake the system */
|
||||
+
|
||||
+#define CAP_WAKE_ALARM 35
|
||||
+
|
||||
+/* Allow preventing system suspends */
|
||||
+
|
||||
+#define CAP_BLOCK_SUSPEND 36
|
||||
+
|
||||
+#define CAP_LAST_CAP CAP_BLOCK_SUSPEND
|
||||
|
||||
#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP)
|
||||
|
||||
--
|
||||
1.7.10.4
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
require libcap.inc
|
||||
|
||||
PR = "r6"
|
||||
|
||||
SRC_URI[md5sum] = "b4896816b626bea445f0b3849bdd4077"
|
||||
SRC_URI[sha256sum] = "e1cae65d8febf2579be37c255d2e058715785ead481a4e6a4357a06aff84721f"
|
|
@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
|
|||
|
||||
DEPENDS = "perl-native-runtime"
|
||||
|
||||
SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \
|
||||
file://fix-CAP_LAST_CAP.patch"
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
|
||||
|
||||
PR = "r1"
|
||||
SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80"
|
||||
SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65"
|
||||
|
||||
inherit lib_package
|
||||
|
||||
|
@ -56,8 +56,10 @@ do_install_append() {
|
|||
# Move the library to base_libdir
|
||||
install -d ${D}${base_libdir}
|
||||
if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
|
||||
mv ${D}${libdir}/* ${D}${base_libdir}
|
||||
rmdir ${D}${libdir}
|
||||
mv ${D}${libdir}/libcap* ${D}${base_libdir}
|
||||
if [ -d ${D}${libdir}/security ]; then
|
||||
mv ${D}${libdir}/security ${D}${base_libdir}
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
Loading…
Reference in New Issue