summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-08-01 21:23:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-02 13:42:09 (GMT)
commit499c092ff59200bcce94c4af4f032d0831597916 (patch)
tree333bc310dfde10c5d77a87ee7520c4408043bb64
parent06838f93e5f3d49c86804f2110fbb0794c94ed43 (diff)
downloadpoky-499c092ff59200bcce94c4af4f032d0831597916.tar.gz
libcap: update 2.36 -> 2.41
(From OE-Core rev: a29045d750b0c75878b6b6237bc657a1ff0b86ac) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch8
-rw-r--r--meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch15
-rw-r--r--meta/recipes-support/libcap/libcap_2.41.bb (renamed from meta/recipes-support/libcap/libcap_2.36.bb)2
3 files changed, 11 insertions, 14 deletions
diff --git a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
index 912f33f..81fdd2a 100644
--- a/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -1,4 +1,4 @@
1From 24d59c99bcba065f1f40f49f870a5f6483b4b078 Mon Sep 17 00:00:00 2001 1From e4fe6890e07821d60f01f000a95f7944f3d68139 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 15 Jan 2020 17:16:28 +0100 3Date: Wed, 15 Jan 2020 17:16:28 +0100
4Subject: [PATCH] tests: do not statically link a test 4Subject: [PATCH] tests: do not statically link a test
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 4 insertions(+), 4 deletions(-) 13 1 file changed, 4 insertions(+), 4 deletions(-)
14 14
15diff --git a/tests/Makefile b/tests/Makefile 15diff --git a/tests/Makefile b/tests/Makefile
16index f9cec56..aa0d09b 100644 16index 876a8b9..93a0e3a 100644
17--- a/tests/Makefile 17--- a/tests/Makefile
18+++ b/tests/Makefile 18+++ b/tests/Makefile
19@@ -29,23 +29,23 @@ psx_test_wrap: psx_test.c $(DEPS) 19@@ -26,23 +26,23 @@ psx_test: psx_test.c $(DEPS)
20 run_libcap_psx_test: libcap_psx_test 20 run_libcap_psx_test: libcap_psx_test
21 21
22 libcap_psx_test: libcap_psx_test.c $(DEPS) 22 libcap_psx_test: libcap_psx_test.c $(DEPS)
@@ -43,4 +43,4 @@ index f9cec56..aa0d09b 100644
43+ $(CC) $(CFLAGS) $< -o $@ 43+ $(CC) $(CFLAGS) $< -o $@
44 44
45 clean: 45 clean:
46 rm -f psx_test psx_test_wrap libcap_psx_test libcap_launch_test *~ 46 rm -f psx_test libcap_psx_test libcap_launch_test *~
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 26d108c..e8f1df9 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 @@
1From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001 1From 5583b48c04d5bf50b56473d88d990c3f0bc45c14 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 20 Dec 2019 16:54:05 +0100 3Date: Fri, 20 Dec 2019 16:54:05 +0100
4Subject: [PATCH] tests: do not run target executables 4Subject: [PATCH] tests: do not run target executables
@@ -7,23 +7,20 @@ Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8 8
9--- 9---
10 tests/Makefile | 3 --- 10 tests/Makefile | 2 --
11 1 file changed, 3 deletions(-) 11 1 file changed, 2 deletions(-)
12 12
13diff --git a/tests/Makefile b/tests/Makefile 13diff --git a/tests/Makefile b/tests/Makefile
14index 95e4ca6..7162cf0 100644 14index bfedbc2..876a8b9 100644
15--- a/tests/Makefile 15--- a/tests/Makefile
16+++ b/tests/Makefile 16+++ b/tests/Makefile
17@@ -19,8 +19,6 @@ sudotest: test 17@@ -19,13 +19,11 @@ sudotest: test run_libcap_launch_test run_libcap_launch_test
18 install: all 18 install: all
19 19
20 run_psx_test: psx_test psx_test_wrap 20 run_psx_test: psx_test
21- ./psx_test 21- ./psx_test
22- ./psx_test_wrap
23 22
24 psx_test: psx_test.c $(DEPS) 23 psx_test: psx_test.c $(DEPS)
25 $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
26@@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS)
27 $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create 24 $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
28 25
29 run_libcap_psx_test: libcap_psx_test 26 run_libcap_psx_test: libcap_psx_test
diff --git a/meta/recipes-support/libcap/libcap_2.36.bb b/meta/recipes-support/libcap/libcap_2.41.bb
index 2c98db6..52d2f13 100644
--- a/meta/recipes-support/libcap/libcap_2.36.bb
+++ b/meta/recipes-support/libcap/libcap_2.41.bb
@@ -12,7 +12,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
12 file://0002-tests-do-not-run-target-executables.patch \ 12 file://0002-tests-do-not-run-target-executables.patch \
13 file://0001-tests-do-not-statically-link-a-test.patch \ 13 file://0001-tests-do-not-statically-link-a-test.patch \
14 " 14 "
15SRC_URI[sha256sum] = "5048c849bdbbe24d2ca59463142cb279abec5edf3ab6731ab35a596bcf538a49" 15SRC_URI[sha256sum] = "880dac4f97795bf5bd0d77ae6476d8c6a854601eb0c461d5a5b91f07d8e60834"
16 16
17UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" 17UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
18 18