3 files changed, 1 insertions, 68 deletions

diff --git a/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch b/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
deleted file mode 100644
index c576351e81..0000000000
--- a/meta/recipes-support/libcap/files/0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bda8da622bd3f4d8b0e577387e988ce364b917c4 Mon Sep 17 00:00:00 2001
-From: Roy Li <rongqing.li@windriver.com>
-Date: Thu, 23 Jun 2016 16:26:43 +0800
-Subject: [PATCH] Ensure the XATTR_NAME_CAPS is defined when it is used
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream-Status: Pending
-
-VFS_CAP_U32 can not ensure that XATTR_NAME_CAPS is defined, and failed to build
-libcap-native in old release, like CentOS release 6.7 (Final), with the blow
-error:
-     cap_file.c: In function ‘cap_get_fd’:
-     cap_file.c:199: error: ‘XATTR_NAME_CAPS’ undeclared (first use in this function)
-     cap_file.c:199: error: (Each undeclared identifier is reported only once
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- libcap/cap_file.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libcap/cap_file.c b/libcap/cap_file.c
-index 0bc07f7..37bc34e 100644
---- a/libcap/cap_file.c
-+++ b/libcap/cap_file.c
-@@ -44,7 +44,7 @@ extern int fremovexattr(int, const char *);
- 
- #include "libcap.h"
- 
--#ifdef VFS_CAP_U32
-+#if defined (VFS_CAP_U32) && defined (XATTR_NAME_CAPS)
- 
- #if VFS_CAP_U32 != __CAP_BLKS
- # error VFS representation of capabilities is not the same size as kernel
diff --git a/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
deleted file mode 100644
index 8cabed6342..0000000000
--- a/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5846ba594bedd66c8fd216cad6518f7be11b7a92 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex.kanavin@gmail.com>
-Date: Fri, 20 Dec 2019 16:54:05 +0100
-Subject: [PATCH] tests: do not run target executables
-
-Upstream-Status: Inappropriate [oe-core specific]
-Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
----
- tests/Makefile | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tests/Makefile b/tests/Makefile
-index 3d03721..fbb1d78 100644
---- a/tests/Makefile
-+++ b/tests/Makefile
-@@ -69,13 +69,11 @@ endif
- 
- # unprivileged
- run_psx_test: psx_test
--       ./psx_test
- 
- psx_test: psx_test.c $(DEPS)
-        $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB)
- 
- run_libcap_psx_test: libcap_psx_test
--       ./libcap_psx_test
- 
- libcap_psx_test: libcap_psx_test.c $(DEPS)
-        $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB)
diff --git a/meta/recipes-support/libcap/libcap_2.74.bb b/meta/recipes-support/libcap/libcap_2.74.bb
index 75019fd35f..ee3605e3a0 100644
--- a/meta/recipes-support/libcap/libcap_2.74.bb
+++ b/meta/recipes-support/libcap/libcap_2.74.bb
@@ -12,10 +12,7 @@ LIC_FILES_CHKSUM = "file://License;md5=2965a646645b72ecee859b43c592dcaa \
 
 DEPENDS = "hostperl-runtime-native gperf-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
-           file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
-           file://0002-tests-do-not-run-target-executables.patch \
-           "
+SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
 SRC_URI:append:class-nativesdk = " \
            file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
            "