summaryrefslogtreecommitdiff
path: root/poky/meta/recipes-support/libcap
diff options
context:
space:
mode:
authorAndrew Geissler <geissonator@yahoo.com>2020-05-15 22:13:32 +0300
committerAndrew Geissler <geissonator@yahoo.com>2020-05-21 23:43:47 +0300
commitc182c62dd929fe69b57a12bc04099fcd09b5d436 (patch)
treea34e6d5c7dc6d91fc51f43b738099b458764e165 /poky/meta/recipes-support/libcap
parent7f40b7168b897da48694d6e71fd3fd45861bfb19 (diff)
downloadopenbmc-c182c62dd929fe69b57a12bc04099fcd09b5d436.tar.xz
poky: subtree update:b5763b2f48..f468a73523
Adrian Bunk (13): iproute2: Remove -fcommon libxcrypt2: Remove -fcommon xorg-xserver: Remove -fcommon mesa: Remove -fcommon at-spi2-atk: Remove -fcommon menu-cache: Replace -fcommon with fix matchbox-wm: Replace -fcommon with fix llvm: Remove -fcommon vte: Remove workaround for gcc 4.8 python-numpy: Remove workaround for host gcc < 5 libtasn1: Remove workaround for host gcc < 5 nettle: Remove workaround for gcc < 5 wireless-regdb: Upgrade 2019.06.03 -> 2020.04.29 Alejandro Hernandez (1): connman: Include vpn-script in FILES Alexander Kanavin (30): libinput: add ptest libinput: update 1.15.2 -> 1.15.5 avahi: merge avahi-ui into the main recipe avahi: update to 0.8 testsdkext/devtool: initialize the test component's git repo git: update to 2.26.2 libcap: update to 2.33 libhandy: add a recipe from meta-oe libdazzle: update to 3.36.0 epiphany: update to 3.36.1 patchelf: switch to git powertop: switch to Arjan's git meson: fix upstream version check rpcsvc-proto: update to 1.4.1 vulkan-headers: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-loader: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-tools: upgrade 1.1.126.0 -> 1.2.135.0 vulkan-demos: upgrade to latest revision e2fsprogs: update to 1.45.6 build-compare: update to latest revision ovmf: update to 202002 cdrtools-native: fix upstream version check re2c: correct upstream location vte: add icu dependency mesa: enable x11 for native/nativesdk runqemu: set host DRI driver path for all instances of virgl usage libepoxy: do not strip RUNPATH from native/nativesdk virgl: skip test on Debian 9 runqemu: force software x11 renderer for SDL when GL is not in use gcr: correct a build race between vapi files Andrej Valek (1): icu: upgrade 66.1 -> 67.1 Anton Eliasson (1): meson.bbclass: Close the log file after reading Bartosz Golaszewski (1): busybox: disable i2ctransfer Changqing Li (2): rpm: fix file conflicts for MIPS64 N32 lib/oe/package_manager: update default rpm config %_prefer_color Jacob Kroon (1): pseudo: Fix enum typedef Joe Slater (1): wget: improve reproducible build Joshua Watt (3): libnewt: Backport patch to fix reproducibility bitbake.conf: Prevent git from detecting parent repo in recipe classes/kernel: Generate reproducible kernel module tarball Kai Kang (1): python3-git: 3.0.5 -> 3.1.2 Khem Raj (9): avahi: Cover gtk packageconfig with x11/wayland distro features tunes: Add new tune files for cortexa55 and cortexa73-cortexa53 gcc-runtime: Avoid march conflicts with newer cortex-a55 CPUs gcc10: Update to GCC 10.1 Release glibc: Update to latest on 2.31 branch gcc10: Default back to -fcommon gcc10: Revert using __getauxval in libgcc glib-2.0: Fix stpcpy detection for mingw wayland: fix condition for strndup detection Konrad Weihmann (2): pypi.bbclass: mind package suffix on version check file: add PACKAGECONFIG for auto options Mingli Yu (1): python3-setuptools: add the missing rdepends Peter Kjellerstedt (2): sstate.bbclass: Do not fail if files cannot be touched file: Remove unneccessary override of PACKAGECONFIG for native Pierre-Jean Texier (1): sysklogd: upgrade 2.1.1 -> 2.1.2 Richard Leitner (6): gdbm: add patch to fix link failure against gcc 10 dtc: update to 1.6.0 libtirpc: remove extra "-fcommon" from CFLAGS libcomps: update to 0.1.15 binutils: add patch to fix issues with gcc 10 cpio: add patch to fix issues with gcc 10 Richard Purdie (4): recipes: Remove remaining INC_PR variables insane: Promote warnings into errors poky: We now match OE-Core's error/warning config so simplify poky.conf: Post release version bump Robert P. J. Day (1): documentation.conf: Add variables supported by features_check.bbclass Tim Orling (1): pypi.bbclass: use new pypi UPSTREAM_CHECK_URI Wang Mingyu (1): nettle: upgrade 3.5.1 -> 3.6 Yeoh Ee Peng (1): selftest/imagefeatures: Enable sanity test for IMAGE_GEN_DEBUGFS Yi Zhao (1): opkg-keyrings: check if opkg-key exists before run postinst Zoltan Boszormenyi (4): libva: Factor out base parts into an include file libva-initial: New bootstrap recipe mesa: Add PACKAGECONFIG knob to enable VAAPI mesa: Add PACKAGECONFIG knob to enable VDPAU state tracker and drivers jan (1): scripts/tiny/ksize: Fix for more recent kernels wenlin.kang@windriver.com (1): populate_sdk_base.bbclass: fix warning: name not matched Change-Id: Icd73153270a6cb7ab63257211350aa564867c2db Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/recipes-support/libcap')
-rw-r--r--poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch32
-rw-r--r--poky/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch24
-rw-r--r--poky/meta/recipes-support/libcap/libcap_2.33.bb (renamed from poky/meta/recipes-support/libcap/libcap_2.32.bb)5
3 files changed, 53 insertions, 8 deletions
diff --git a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
index e568cc47c..912f33f16 100644
--- a/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
+++ b/poky/meta/recipes-support/libcap/files/0001-tests-do-not-statically-link-a-test.patch
@@ -1,4 +1,4 @@
-From 1179b423cce8d119b42cebfb3daa77c540fdca43 Mon Sep 17 00:00:00 2001
+From 24d59c99bcba065f1f40f49f870a5f6483b4b078 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,20 +7,40 @@ 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(-)
+ tests/Makefile | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/Makefile b/tests/Makefile
-index 7162cf0..6af47af 100644
+index f9cec56..aa0d09b 100644
--- a/tests/Makefile
+++ b/tests/Makefile
-@@ -29,7 +29,7 @@ psx_test_wrap: psx_test.c $(DEPS)
+@@ -29,23 +29,23 @@ 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
+ run_libcap_launch_test: libcap_launch_test libcap_psx_launch_test noop
+ sudo ./libcap_launch_test
+ sudo ./libcap_psx_launch_test
+
+ libcap_launch_test: libcap_launch_test.c $(DEPS)
+- $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB) --static
++ $(CC) $(CFLAGS) $(IPATH) $< -o $@ $(LIBCAPLIB)
+
+ # this varies only slightly from the above insofar as it currently
+ # only links in the pthreads fork support. TODO() we need to change
+ # the source to do something interesting with pthreads.
+ libcap_psx_launch_test: libcap_launch_test.c $(DEPS)
+- $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create --static
++ $(CC) $(CFLAGS) $(IPATH) -DWITH_PTHREADS $< -o $@ $(LIBCAPLIB) $(LIBPSXLIB) -Wl,-wrap,pthread_create
+
+ noop: noop.c
+- $(CC) $(CFLAGS) $< -o $@ --static
++ $(CC) $(CFLAGS) $< -o $@
+
clean:
- rm -f psx_test psx_test_wrap libcap_psx_test
+ rm -f psx_test psx_test_wrap libcap_psx_test libcap_launch_test *~
diff --git a/poky/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch b/poky/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
new file mode 100644
index 000000000..848ceb2c0
--- /dev/null
+++ b/poky/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
@@ -0,0 +1,24 @@
+From a2c4cdb05d0e382101b13944c09c4375e8d7de5f Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 31 Mar 2020 13:39:28 +0200
+Subject: [PATCH] psx.c: replace pthread_yield() with standard sched_yield()
+
+This was causing failures when building with musl C library in
+particular.
+
+Upstream-Status: Pending
+Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
+---
+diff --git a/libcap/psx.c b/libcap/psx.c
+index 04d250f..7e4ac10 100644
+--- a/libcap/psx.c
++++ b/libcap/psx.c
+@@ -533,7 +533,7 @@ long int __psx_syscall(long int syscall_nr, ...) {
+ if (!waiting) {
+ break;
+ }
+- pthread_yield();
++ sched_yield();
+ }
+
+ errno = restore_errno;
diff --git a/poky/meta/recipes-support/libcap/libcap_2.32.bb b/poky/meta/recipes-support/libcap/libcap_2.33.bb
index d78a58f7d..bec492ca5 100644
--- a/poky/meta/recipes-support/libcap/libcap_2.32.bb
+++ b/poky/meta/recipes-support/libcap/libcap_2.33.bb
@@ -11,9 +11,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${
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 \
+ file://0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch \
"
-SRC_URI[md5sum] = "7416119c9fdcfd0e8dd190a432c668e9"
-SRC_URI[sha256sum] = "1005e3d227f2340ad1e3360ef8b69d15e3c72a29c09f4894d7aac038bd26e2be"
+SRC_URI[md5sum] = "dcc6220b4a9bf260050b20c07edcddf4"
+SRC_URI[sha256sum] = "08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"