mirror of
https://git.yoctoproject.org/poky
synced 2026-04-21 21:32:12 +02:00
libcap: update 2.49 -> 2.50
(From OE-Core rev: 791d1a215400db08ef98193b2621ec02f108a302) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
c7b15f642b
commit
d39cef3f82
@@ -1,4 +1,4 @@
|
||||
From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 Mon Sep 17 00:00:00 2001
|
||||
From 897900f3f9084c5542097851323bba3f2691df20 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 15 Jan 2020 17:16:28 +0100
|
||||
Subject: [PATCH] tests: do not statically link a test
|
||||
@@ -7,26 +7,27 @@ 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 1d7fc7a..37db8f7 100644
|
||||
index 289186e..071a285 100644
|
||||
--- a/progs/Makefile
|
||||
+++ b/progs/Makefile
|
||||
@@ -42,7 +42,7 @@ endif
|
||||
test: $(PROGS)
|
||||
@@ -49,7 +49,7 @@ capsh: capsh.c capshdoc.h.cf $(DEPS)
|
||||
$(CC) $(IPATH) $(CAPSH_SHELL) $(CFLAGS) -o $@ $< $(LIBCAPLIB) $(LDFLAGS)
|
||||
|
||||
tcapsh-static: capsh.c $(DEPS)
|
||||
tcapsh-static: capsh.c capshdoc.h.cf $(DEPS)
|
||||
- $(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
|
||||
diff --git a/tests/Makefile b/tests/Makefile
|
||||
index 01f7589..094ec57 100644
|
||||
index 4a5f2f9..4266d86 100644
|
||||
--- a/tests/Makefile
|
||||
+++ b/tests/Makefile
|
||||
@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
|
||||
@@ -38,7 +39,7 @@ index 01f7589..094ec57 100644
|
||||
DEPS=../libcap/libcap.a
|
||||
ifeq ($(PTHREADS),yes)
|
||||
DEPS += ../libcap/libpsx.a
|
||||
@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
|
||||
@@ -113,7 +113,7 @@ noexploit: exploit.o $(DEPS)
|
||||
|
||||
# This one runs in a chroot with no shared library files.
|
||||
noop: noop.c
|
||||
@@ -46,7 +47,4 @@ index 01f7589..094ec57 100644
|
||||
+ $(CC) $(CFLAGS) $< -o $@
|
||||
|
||||
clean:
|
||||
rm -f psx_test libcap_psx_test libcap_launch_test *~
|
||||
--
|
||||
2.17.1
|
||||
|
||||
rm -f psx_test libcap_psx_test libcap_launch_test uns_test *~
|
||||
|
||||
@@ -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] = "e98bc4d93645082ec787730b0fd1a712b38882465c505777de17c338831ee181"
|
||||
SRC_URI[sha256sum] = "47a57b8bd238b84c93c921a9b4ff82337551dbcb0cca071316aadf3e23b19261"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
|
||||
|
||||
Reference in New Issue
Block a user