diff options
-rw-r--r-- | meta/recipes-support/libcap/files/0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch | 6 | ||||
-rw-r--r-- | meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch | 10 | ||||
-rw-r--r-- | meta/recipes-support/libcap/libcap_2.59.bb (renamed from meta/recipes-support/libcap/libcap_2.54.bb) | 2 |
3 files changed, 8 insertions, 10 deletions
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 @@ | |||
1 | From 794cebc5732908636f22a1d9843fed3ae664899a Mon Sep 17 00:00:00 2001 | 1 | From 75843ed8238523776683a8660621d74c06597f11 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Thu, 14 Oct 2021 15:57:36 +0800 | 3 | Date: Thu, 14 Oct 2021 15:57:36 +0800 |
4 | Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl | 4 | Subject: [PATCH] nativesdk-libcap: Raise the size of arrays containing dl |
@@ -14,6 +14,7 @@ the strings in a certain path. | |||
14 | Upstream-Status: Inappropriate [SDK specific] | 14 | Upstream-Status: Inappropriate [SDK specific] |
15 | 15 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
17 | |||
17 | --- | 18 | --- |
18 | libcap/execable.h | 2 +- | 19 | libcap/execable.h | 2 +- |
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | 20 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -31,6 +32,3 @@ index 0bcc5d4..6e2a080 100644 | |||
31 | SHARED_LOADER ; | 32 | SHARED_LOADER ; |
32 | 33 | ||
33 | static void __execable_parse_args(int *argc_p, char ***argv_p) | 34 | static void __execable_parse_args(int *argc_p, char ***argv_p) |
34 | -- | ||
35 | 2.27.0 | ||
36 | |||
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 @@ | |||
1 | From cc97f84469ee7b266977a20d9cfa63c52f821384 Mon Sep 17 00:00:00 2001 | 1 | From 10212b6d4e8843feffbeab5336342d97f3a46bb2 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 20 Dec 2019 16:54:05 +0100 | 3 | Date: Fri, 20 Dec 2019 16:54:05 +0100 |
4 | Subject: [PATCH] tests: do not run target executables | 4 | Subject: [PATCH] tests: do not run target executables |
@@ -11,20 +11,20 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 2 deletions(-) | 11 | 1 file changed, 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/tests/Makefile b/tests/Makefile | 13 | diff --git a/tests/Makefile b/tests/Makefile |
14 | index d9ed248..2864f77 100644 | 14 | index ecb7d1b..8950c73 100644 |
15 | --- a/tests/Makefile | 15 | --- a/tests/Makefile |
16 | +++ b/tests/Makefile | 16 | +++ b/tests/Makefile |
17 | @@ -63,13 +63,11 @@ endif | 17 | @@ -61,13 +61,11 @@ endif |
18 | 18 | ||
19 | # unprivileged | 19 | # unprivileged |
20 | run_psx_test: psx_test | 20 | run_psx_test: psx_test |
21 | - ./psx_test | 21 | - ./psx_test |
22 | 22 | ||
23 | psx_test: psx_test.c $(DEPS) | 23 | psx_test: psx_test.c $(DEPS) |
24 | $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) $(LDFLAGS) | 24 | $(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< -o $@ $(LINKEXTRA) $(LIBPSXLIB) |
25 | 25 | ||
26 | run_libcap_psx_test: libcap_psx_test | 26 | run_libcap_psx_test: libcap_psx_test |
27 | - ./libcap_psx_test | 27 | - ./libcap_psx_test |
28 | 28 | ||
29 | libcap_psx_test: libcap_psx_test.c $(DEPS) | 29 | libcap_psx_test: libcap_psx_test.c $(DEPS) |
30 | $(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LINKEXTRA) $(LIBCAPLIB) $(LIBPSXLIB) $(LDFLAGS) | 30 | $(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 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}-${ | |||
16 | SRC_URI:append:class-nativesdk = " \ | 16 | SRC_URI:append:class-nativesdk = " \ |
17 | file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ | 17 | file://0001-nativesdk-libcap-Raise-the-size-of-arrays-containing.patch \ |
18 | " | 18 | " |
19 | SRC_URI[sha256sum] = "5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f" | 19 | SRC_URI[sha256sum] = "49f64ae40b113e53cbc161e22af7094e3bb4a0611fa33ef5a4257b011779f034" |
20 | 20 | ||
21 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" | 21 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" |
22 | 22 | ||