summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2020-12-23 10:23:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-24 08:25:10 +0000
commit86d657364bb2ed859ed7151d56cca431104d8279 (patch)
tree93a5387b62b8a24f025ccca5beb98a2f7496775a /meta/recipes-support
parent36a2dc83fd0e1d6e2b8441e24a4cbc48a6c4fc19 (diff)
downloadopenembedded-core-86d657364bb2ed859ed7151d56cca431104d8279.tar.gz
openembedded-core-86d657364bb2ed859ed7151d56cca431104d8279.tar.bz2
openembedded-core-86d657364bb2ed859ed7151d56cca431104d8279.zip
libcap: update 2.45 -> 2.46
Rebase 0001-tests-do-not-statically-link-a-test.patch Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r--meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch10
-rw-r--r--meta/recipes-support/libcap/libcap_2.46.bb (renamed from meta/recipes-support/libcap/libcap_2.45.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 3c737b884e..d2653afb75 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 @@
-From c22c6c16362c7dbc8d6faea06edee5e07759c5fa Mon Sep 17 00:00:00 2001
+From 6aa15fe548e5b1d6ca3b373779beb7521ea95ba9 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,7 +7,6 @@ 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 ++--
@@ -27,7 +26,7 @@ index 1d7fc7a..37db8f7 100644
sudotest: test tcapsh-static
sudo $(LDPATH) ./quicktest.sh
diff --git a/tests/Makefile b/tests/Makefile
-index 3431df9..727fb86 100644
+index 01f7589..094ec57 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -22,7 +22,7 @@ ifeq ($(PTHREADS),yes)
@@ -36,7 +35,7 @@ index 3431df9..727fb86 100644
else
-LDFLAGS += --static
+LDFLAGS +=
- DEPS=../libcap/libcap.a ../progs/tcapsh-static
+ DEPS=../libcap/libcap.a
ifeq ($(PTHREADS),yes)
DEPS += ../libcap/libpsx.a
@@ -106,7 +106,7 @@ noexploit: exploit.o $(DEPS)
@@ -48,3 +47,6 @@ index 3431df9..727fb86 100644
clean:
rm -f psx_test libcap_psx_test libcap_launch_test *~
+--
+2.17.1
+
diff --git a/meta/recipes-support/libcap/libcap_2.45.bb b/meta/recipes-support/libcap/libcap_2.46.bb
index 067ba32d99..605a738127 100644
--- a/meta/recipes-support/libcap/libcap_2.45.bb
+++ b/meta/recipes-support/libcap/libcap_2.46.bb
@@ -12,7 +12,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] = "d66639f765c0e10557666b00f519caf0bd07a95f867dddaee131cd284fac3286"
+SRC_URI[sha256sum] = "4ed3d11413fa6c9667e49f819808fbb581cd8864b839f87d7c2a02c70f21d8b4"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"