diff options
author | wangmy <wangmy@fujitsu.com> | 2021-06-23 07:51:38 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-26 11:27:17 +0100 |
commit | 46e198e2f35cc2dc00b8bd00f5cc8a66b4791f6b (patch) | |
tree | a64cd4326f31973794fa1dadd6c5ca3c7fc90ba5 /meta/recipes-support/libcap | |
parent | 9c1fa69c54bc7e7044f439db9bf0d127b3d95221 (diff) | |
download | poky-46e198e2f35cc2dc00b8bd00f5cc8a66b4791f6b.tar.gz |
libcap: upgrade 2.50 -> 2.51
refresh 0001-tests-do-not-statically-link-a-test.patch
(From OE-Core rev: 07f0e1a6e92800f651627687edbc51c714947846)
(From OE-Core rev: 734a489a2d9891f1f42144923ce67a3faeb5713e)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libcap')
-rw-r--r-- | meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch | 10 | ||||
-rw-r--r-- | meta/recipes-support/libcap/libcap_2.51.bb (renamed from meta/recipes-support/libcap/libcap_2.50.bb) | 2 |
2 files changed, 7 insertions, 5 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 414e45a6f4..55872aa8fa 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 | |||
@@ -7,14 +7,13 @@ This fails on e.g. centos 7 | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-core specific] | 8 | Upstream-Status: Inappropriate [oe-core specific] |
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
10 | |||
11 | --- | 10 | --- |
12 | progs/Makefile | 2 +- | 11 | progs/Makefile | 2 +- |
13 | tests/Makefile | 4 ++-- | 12 | tests/Makefile | 4 ++-- |
14 | 2 files changed, 3 insertions(+), 3 deletions(-) | 13 | 2 files changed, 3 insertions(+), 3 deletions(-) |
15 | 14 | ||
16 | diff --git a/progs/Makefile b/progs/Makefile | 15 | diff --git a/progs/Makefile b/progs/Makefile |
17 | index 289186e..071a285 100644 | 16 | index 3e82862..48533f3 100644 |
18 | --- a/progs/Makefile | 17 | --- a/progs/Makefile |
19 | +++ b/progs/Makefile | 18 | +++ b/progs/Makefile |
20 | @@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) | 19 | @@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) |
@@ -24,8 +23,8 @@ index 289186e..071a285 100644 | |||
24 | - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static | 23 | - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static |
25 | + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) | 24 | + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) |
26 | 25 | ||
27 | sudotest: test tcapsh-static | 26 | uns_test: ../tests/uns_test.c |
28 | sudo $(LDPATH) ./quicktest.sh | 27 | $(MAKE) -C ../tests uns_test |
29 | diff --git a/tests/Makefile b/tests/Makefile | 28 | diff --git a/tests/Makefile b/tests/Makefile |
30 | index 4a5f2f9..4266d86 100644 | 29 | index 4a5f2f9..4266d86 100644 |
31 | --- a/tests/Makefile | 30 | --- a/tests/Makefile |
@@ -48,3 +47,6 @@ index 4a5f2f9..4266d86 100644 | |||
48 | 47 | ||
49 | clean: | 48 | clean: |
50 | rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~ | 49 | rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~ |
50 | -- | ||
51 | 2.25.1 | ||
52 | |||
diff --git a/meta/recipes-support/libcap/libcap_2.50.bb b/meta/recipes-support/libcap/libcap_2.51.bb index 15137f0ac0..a43dca9f13 100644 --- a/meta/recipes-support/libcap/libcap_2.50.bb +++ b/meta/recipes-support/libcap/libcap_2.51.bb | |||
@@ -14,7 +14,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${ | |||
14 | file://0002-tests-do-not-run-target-executables.patch \ | 14 | file://0002-tests-do-not-run-target-executables.patch \ |
15 | file://0001-tests-do-not-statically-link-a-test.patch \ | 15 | file://0001-tests-do-not-statically-link-a-test.patch \ |
16 | " | 16 | " |
17 | SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261" | 17 | SRC_URI[sha256sum] = "6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" | 19 | UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" |
20 | 20 | ||