From: Alexander Kanavin <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 06/24] libcap: update to 2.31
Date: Mon, 20 Jan 2020 18:24:52 +0100 [thread overview]
Message-ID: <20200120172510.22648-6-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200120172510.22648-1-alex.kanavin@gmail.com>
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
...-tests-do-not-statically-link-a-test.patch | 26 +++++++++++++++
...-tests-do-not-run-target-executables.patch | 33 +++++++++++++++++++
.../libcap/{libcap_2.27.bb => libcap_2.31.bb} | 6 ++--
3 files changed, 63 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
create mode 100644 meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
rename meta/recipes-support/libcap/{libcap_2.27.bb => libcap_2.31.bb} (87%)
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
new file mode 100644
index 00000000000..e568cc47c5f
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -0,0 +1,26 @@
+From 1179b423cce8d119b42cebfb3daa77c540fdca43 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
+
+This fails on e.g. centos 7
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+ tests/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 7162cf0..6af47af 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS)
+ run_libcap_psx_test: libcap_psx_test
+
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create
+
+ clean:
+ rm -f psx_test psx_test_wrap libcap_psx_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
new file mode 100644
index 00000000000..26d108c209e
--- /dev/null
+++ b/meta/recipes-support/libcap/files/0002-tests-do-not-run-target-executables.patch
@@ -0,0 +1,33 @@
+From 6309554225e05e76167eda4e0df383fb3d1a62c3 Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Fri, 20 Dec 2019 16:54:05 +0100
+Subject: [PATCH] tests: do not run target executables
+
+Upstream-Status: Inappropriate [oe-core specific]
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+
+---
+ tests/Makefile | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 95e4ca6..7162cf0 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -19,8 +19,6 @@ sudotest: test
+ install: all
+
+ run_psx_test: psx_test psx_test_wrap
+- ./psx_test
+- ./psx_test_wrap
+
+ psx_test: psx_test.c $(DEPS)
+ $(CC) $(CFLAGS) $(IPATH) -DNOWRAP $< -o $@ $(LIBPSXLIB)
+@@ -29,7 +27,6 @@ psx_test_wrap: psx_test.c $(DEPS)
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBPSXLIB) -Wl,-wrap,pthread_create
+
+ run_libcap_psx_test: libcap_psx_test
+- ./libcap_psx_test
+
+ libcap_psx_test: libcap_psx_test.c $(DEPS)
+ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
diff --git a/meta/recipes-support/libcap/libcap_2.27.bb b/meta/recipes-support/libcap/libcap_2.31.bb
similarity index 87%
rename from meta/recipes-support/libcap/libcap_2.27.bb
rename to meta/recipes-support/libcap/libcap_2.31.bb
index 3f64ff76364..97959c1025b 100644
--- a/meta/recipes-support/libcap/libcap_2.27.bb
+++ b/meta/recipes-support/libcap/libcap_2.31.bb
@@ -9,9 +9,11 @@ DEPENDS = "hostperl-runtime-native gperf-native"
SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz \
file://0001-ensure-the-XATTR_NAME_CAPS-is-defined-when-it-is-use.patch \
+ file://0002-tests-do-not-run-target-executables.patch \
+ file://0001-tests-do-not-statically-link-a-test.patch \
"
-SRC_URI[md5sum] = "2e8f9fab32eb5ccb37969fe317fd17aa"
-SRC_URI[sha256sum] = "dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a"
+SRC_URI[md5sum] = "52120c05dc797b01f5a7ae70f4335e96"
+SRC_URI[sha256sum] = "c6088de41e1c97fa8047e2e7de0e4ee0cd13e6cc16538022230ae76727a87c46"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
--
2.17.1
next prev parent reply other threads:[~2020-01-20 17:25 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-20 17:24 [PATCH 01/24] python3: update to 3.8.1 Alexander Kanavin
2020-01-20 17:24 ` [PATCH 02/24] python3: do not compile .pyc in parallel during do_install() Alexander Kanavin
2020-01-20 17:24 ` [PATCH 03/24] python3: correctly process ptest output with sed Alexander Kanavin
2020-01-20 17:24 ` [PATCH 04/24] gstreamer1.0-python: add a patch to fix python 3.8 builds Alexander Kanavin
2020-01-20 17:24 ` [PATCH 05/24] nss: update to 3.49.1 Alexander Kanavin
2020-01-21 12:04 ` Andreas Müller
2020-01-21 12:47 ` Richard Purdie
2020-01-21 19:35 ` Khem Raj
2020-01-21 20:22 ` Richard Purdie
2020-01-21 22:02 ` Khem Raj
2020-01-22 8:13 ` Khem Raj
2020-01-20 17:24 ` Alexander Kanavin [this message]
2020-01-20 17:24 ` [PATCH 07/24] selftest: check maintainers.inc for entries without recipes Alexander Kanavin
2020-01-20 17:24 ` [PATCH 08/24] core-image-sato-sdk-ptest: do not pull in ptest-pkgs Alexander Kanavin
2020-01-20 17:24 ` [PATCH 09/24] ptests: exclude mdadm from ptesting Alexander Kanavin
2020-01-20 17:24 ` [PATCH 10/24] ptests: exclude lttng-tools Alexander Kanavin
2020-01-20 17:37 ` Jonathan Rajotte-Julien
2020-01-20 17:44 ` Alexander Kanavin
2020-01-24 12:47 ` Alexander Kanavin
2020-01-24 15:35 ` Jonathan Rajotte-Julien
2020-01-20 22:46 ` Richard Purdie
2020-01-20 17:24 ` [PATCH 11/24] openssh: applied upstream fix for "cert not yet valid" test Alexander Kanavin
2020-01-20 17:24 ` [PATCH 12/24] openssh: explicitly skip unit tests Alexander Kanavin
2020-01-20 17:24 ` [PATCH 13/24] parted: fix more ptests Alexander Kanavin
2020-01-20 17:25 ` [PATCH 14/24] qemu.inc: add vfat to MACHINE_FEATURES Alexander Kanavin
2020-01-20 17:25 ` [PATCH 15/24] rt-tests: exclude another development version (1.6) Alexander Kanavin
2020-01-20 17:25 ` [PATCH 16/24] btrfs-tools: upgrade 5.4 -> 5.4.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 17/24] libpipeline: upgrade 1.5.1 -> 1.5.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 18/24] msmtp: upgrade 1.8.6 -> 1.8.7 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 19/24] ffmpeg: upgrade 4.2.1 -> 4.2.2 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 20/24] epiphany: upgrade 3.34.2 -> 3.34.3.1 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 21/24] libwebp: upgrade 1.0.3 -> 1.1.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 22/24] createrepo-c: upgrade 0.15.4 -> 0.15.5 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 23/24] libsecret: upgrade 0.19.1 -> 0.20.0 Alexander Kanavin
2020-01-20 17:25 ` [PATCH 24/24] meson: update 0.52.1 -> 0.53.0 Alexander Kanavin
2020-01-21 8:24 ` Richard Purdie
2020-01-21 18:44 ` Khem Raj
2020-01-23 15:48 ` Alexander Kanavin
2020-01-23 15:52 ` Khem Raj
2020-01-20 17:32 ` ✗ patchtest: failure for "python3: update to 3.8.1..." and 23 more Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200120172510.22648-6-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox