From: Wang Mingyu Date: Wed, 16 Jul 2025 06:42:57 +0000 (+0800) Subject: rt-tests: upgrade 2.8 -> 2.9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02c62abe932322ef99fd03c948c745e4088a645;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git rt-tests: upgrade 2.8 -> 2.9 0001-sched_attr-Do-not-define-for-glibc-2.41.patch removed since it's included in 2.9 Signed-off-by: Wang Mingyu Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-rt/rt-tests/files/0001-sched_attr-Do-not-define-for-glibc-2.41.patch b/meta/recipes-rt/rt-tests/files/0001-sched_attr-Do-not-define-for-glibc-2.41.patch deleted file mode 100644 index 915f8baa61b..00000000000 --- a/meta/recipes-rt/rt-tests/files/0001-sched_attr-Do-not-define-for-glibc-2.41.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e1f5f9379a68471c9f5fb0859e87dd84001b0b6f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 28 Jan 2025 15:03:59 -0800 -Subject: [PATCH] sched_attr: Do not define for glibc >= 2.41 - -glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions -and struct sched_attr. Therefore, it needs to be checked for here as well before -defining sched_attr - -Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0 - -Fixes builds with glibc/trunk - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8 - -Upstream-Status: Submitted [https://lore.kernel.org/linux-rt-users/20250128230838.2311298-1-raj.khem@gmail.com/T/#u] -Signed-off-by: Khem Raj -Cc: Clark Williams -Cc: John Kacur -Cc: rt-users ---- - src/include/rt-sched.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h -index 80171c7..9cf0e3a 100644 ---- a/src/include/rt-sched.h -+++ b/src/include/rt-sched.h -@@ -42,6 +42,8 @@ - #define __NR_sched_getattr 275 - #endif - -+/* sched_attr is not defined in glibc < 2.41 */ -+#ifndef SCHED_ATTR_SIZE_VER0 - struct sched_attr { - uint32_t size; - uint32_t sched_policy; -@@ -68,4 +70,6 @@ int sched_getattr(pid_t pid, - unsigned int size, - unsigned int flags); - -+#endif /* SCHED_ATTR_SIZE_VER0 */ -+ - #endif /* __RT_SCHED_H__ */ diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index a2e8558c4c6..2042768d5ac 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,6 +1,6 @@ -SRCREV = "f5b910a90b6f5ab0ef6df392e009ffe1429d53af" -PV = "2.8" +SRCREV = "9166c3f0bb9c5d3e31dc80aff165a5073b5ac5be" +PV = "2.9" PE = "1" -SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" +SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https;tag=v${PV}" diff --git a/meta/recipes-rt/rt-tests/rt-tests_git.bb b/meta/recipes-rt/rt-tests/rt-tests_git.bb index 5fa980dbdf1..1f48e143d47 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_git.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_git.bb @@ -13,7 +13,6 @@ SRC_URI += " \ file://run-ptest \ file://rt_bmark.py \ file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ - file://0001-sched_attr-Do-not-define-for-glibc-2.41.patch \ " # rt-tests needs PI mutex support in libc