mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcap: upgrade 2.33 -> 2.34

Browse Source 
(From OE-Core rev: c6bf01bb5e09de205f324211090b52d81323b4ab)

Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2020-05-31 17:52:27 +02:00
committed by Richard Purdie
parent 810f745b52
commit 42ac4b97b9
2 changed files with 3 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch
View File

@@ -1,24 +0,0 @@
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;

7
meta/recipes-support/libcap/libcap_2.33.bb → meta/recipes-support/libcap/libcap_2.34.bb
View File

@@ -11,10 +11,9 @@ 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] = "dcc6220b4a9bf260050b20c07edcddf4"
SRC_URI[sha256sum] = "08edeaba2757021aeec45c4eeec52566675e0e0f5d4f057284d729e04f2643d6"
SRC_URI[md5sum] = "66028a8080a0891c54b202bb5e749035"
SRC_URI[sha256sum] = "aecdd42015955068d3d94b7caa9590fcb2de5df53ce53c61a21b912bfc0b1611"
UPSTREAM_CHECK_URI = "https://www.kernel.org/pub/linux/libs/security/linux-privs/${BPN}2/"
@@ -26,7 +25,7 @@ do_configure() {
# libcap uses := for compilers, fortunately, it gives us a hint
# on what should be replaced with ?=
sed -e 's,:=,?=,g' -i Make.Rules
sed -e 's,^BUILD_CFLAGS ?= $(.*CFLAGS),BUILD_CFLAGS := $(BUILD_CFLAGS),' -i Make.Rules
sed -e 's,^BUILD_CFLAGS ?= ,BUILD_CFLAGS := $(BUILD_CFLAGS) ,' -i Make.Rules
}
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"