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:23:04 +0100 |
| commit | 734a489a2d9891f1f42144923ce67a3faeb5713e (patch) | |
| tree | 065918345136d1746827ab59be6479b000be1b0f /meta/recipes-support | |
| parent | 01b41f7deed48b33b35c84e32ef55de3e63b9bc1 (diff) | |
| download | openembedded-core-734a489a2d9891f1f42144923ce67a3faeb5713e.tar.gz | |
libcap: upgrade 2.50 -> 2.51
refresh 0001-tests-do-not-statically-link-a-test.patch
(From OE-Core rev: 07f0e1a6e92800f651627687edbc51c714947846)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Diffstat (limited to 'meta/recipes-support')
| -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 Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- progs/Makefile | 2 +- tests/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/progs/Makefile b/progs/Makefile -index 289186e..071a285 100644 +index 3e82862..48533f3 100644 --- a/progs/Makefile +++ b/progs/Makefile @@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS) @@ -24,8 +23,8 @@ index 289186e..071a285 100644 - $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) --static + $(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS) - sudotest: test tcapsh-static - sudo $(LDPATH) ./quicktest.sh + uns_test: ../tests/uns_test.c + $(MAKE) -C ../tests uns_test diff --git a/tests/Makefile b/tests/Makefile index 4a5f2f9..4266d86 100644 --- a/tests/Makefile @@ -48,3 +47,6 @@ index 4a5f2f9..4266d86 100644 clean: rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~ +-- +2.25.1 + 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}-${ file://0002-tests-do-not-run-target-executables.patch \ file://0001-tests-do-not-statically-link-a-test.patch \ " -SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261" +SRC_URI[sha256sum] = "6609f3ab7aebcc8f9277f53a577c657d9f3056d1352ea623da7fd7c0f00890f9" UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/" |