From: Alexander Kanavin <[email protected]>

Signed-off-by: Alexander Kanavin <[email protected]>
---
 ...dk-libcap-Raise-the-size-of-arrays-containing.patch |  6 ++----
 .../0002-tests-do-not-run-target-executables.patch     | 10 +++++-----
 .../libcap/{libcap_2.54.bb => libcap_2.59.bb}          |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename meta/recipes-support/libcap/{libcap_2.54.bb => libcap_2.59.bb} (96%)

diff --git 
a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
 
b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
index c7bf1a8b8c..6e43ba3366 100644
--- 
a/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
+++ 
b/meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch
@@ -1,4 +1,4 @@
-From 794cebc5732908636f22a1d9843fed3ae664899a Mon Sep 17 00:00:00 2001
+From 75843ed8238523776683a8660621d74c06597f11 Mon Sep 17 00:00:00 2001
 From: Hongxu Jia <[email protected]>
 Date: Thu, 14 Oct 2021 15:57:36 +0800
 Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl
@@ -14,6 +14,7 @@ the strings in a certain path.
 Upstream-Status: Inappropriate [SDK specific]
 
 Signed-off-by: Hongxu Jia <[email protected]>
+
 ---
  libcap/execable.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -31,6 +32,3 @@ index 0bcc5d4..6e2a080 100644
      SHARED_LOADER ;
  
  static void __execable_parse_args(int *argc_p, char ***argv_p)
--- 
-2.27.0
-
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
index 0fe7295a5f..20346cf2fb 100644
--- 
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
@@ -1,4 +1,4 @@
-From cc97f84469ee7b266977a20d9cfa63c52f821384 Mon Sep 17 00:00:00 2001
+From 10212b6d4e8843feffbeab5336342d97f3a46bb2 Mon Sep 17 00:00:00 2001
 From: Alexander Kanavin <[email protected]>
 Date: Fri, 20 Dec 2019 16:54:05 +0100
 Subject: [PATCH] tests: do not run target executables
@@ -11,20 +11,20 @@ Signed-off-by: Alexander Kanavin <[email protected]>
  1 file changed, 2 deletions(-)
 
 diff --git a/tests/Makefile b/tests/Makefile
-index d9ed248..2864f77 100644
+index ecb7d1b..8950c73 100644
 --- a/tests/Makefile
 +++ b/tests/Makefile
-@@ -63,13 +63,11 @@ endif
+@@ -61,13 +61,11 @@ endif
  
  # unprivileged
  run_psx_test: psx_test
 -      ./psx_test
  
  psx_test: psx_test.c $(DEPS)
-       $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) 
$(LDFLAGS)
+       $(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) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) 
$(LIBPSXLIB) $(LDFLAGS)
+       $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) 
$(LIBCAPLIB) $(LIBPSXLIB)
diff --git a/meta/recipes-support/libcap/libcap_2.54.bb 
b/meta/recipes-support/libcap/libcap_2.59.bb
similarity index 96%
rename from meta/recipes-support/libcap/libcap_2.54.bb
rename to meta/recipes-support/libcap/libcap_2.59.bb
index fe29f05483..3d2592d962 100644
--- a/meta/recipes-support/libcap/libcap_2.54.bb
+++ b/meta/recipes-support/libcap/libcap_2.59.bb
@@ -16,7 +16,7 @@ SRC_URI = 
"${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
 SRC_URI:append:class-nativesdk = " \
            
file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \
            "
-SRC_URI[sha256sum] = 
"5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f"
+SRC_URI[sha256sum] = 
"49f64ae40b113e53cbc161e22af7094e3bb4a0611fa33ef5a4257b011779f034"
 
 UPSTREAM_CHECK_URI = 
"https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/";
 
-- 
2.20.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#157179): 
https://lists.openembedded.org/g/openembedded-core/message/157179
Mute This Topic: https://lists.openembedded.org/mt/86442714/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to