Signed-off-by: Alexander Kanavin <[email protected]> --- ...hread_yield-with-standard-sched_yiel.patch | 24 ------------------- .../libcap/{libcap_2.33.bb => libcap_2.34.bb} | 7 +++--- 2 files changed, 3 insertions(+), 28 deletions(-) delete mode 100644 meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch rename meta/recipes-support/libcap/{libcap_2.33.bb => libcap_2.34.bb} (86%)
diff --git a/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch b/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch deleted file mode 100644 index 848ceb2c0c..0000000000 --- a/meta/recipes-support/libcap/files/0004-psx.c-replace-pthread_yield-with-standard-sched_yiel.patch +++ /dev/null @@ -1,24 +0,0 @@ -From a2c4cdb05d0e382101b13944c09c4375e8d7de5f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <[email protected]> -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 <[email protected]> ---- -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/meta/recipes-support/libcap/libcap_2.33.bb b/meta/recipes-support/libcap/libcap_2.34.bb similarity index 86% rename from meta/recipes-support/libcap/libcap_2.33.bb rename to meta/recipes-support/libcap/libcap_2.34.bb index bec492ca5f..a3bd969d2b 100644 --- a/meta/recipes-support/libcap/libcap_2.33.bb +++ b/meta/recipes-support/libcap/libcap_2.34.bb @@ -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)}" -- 2.26.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#138976): https://lists.openembedded.org/g/openembedded-core/message/138976 Mute This Topic: https://lists.openembedded.org/mt/74584204/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
