From 377c51ed0c288582d248bd4680481e5b7646d813 Mon Sep 17 00:00:00 2001
From: Upgrade Helper <auh@yoctoproject.org>
Date: Tue, 15 Jul 2025 08:01:21 +0000
Subject: [PATCH] rt-tests,hwlatdetect: upgrade 2.8 -> 2.9,2.8 -> 2.9

---
 ...Allow-for-CC-and-AR-to-be-overridden.patch |  9 ++--
 ...ed_attr-Do-not-define-for-glibc-2.41.patch | 44 -------------------
 meta/recipes-rt/rt-tests/rt-tests.inc         |  4 +-
 meta/recipes-rt/rt-tests/rt-tests_git.bb      |  8 ++--
 4 files changed, 10 insertions(+), 55 deletions(-)
 delete mode 100644 meta/recipes-rt/rt-tests/files/0001-sched_attr-Do-not-define-for-glibc-2.41.patch

diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
index fface76731..afd6be40c6 100644
--- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
+++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
@@ -1,4 +1,4 @@
-From 7cf4cf097895bd4c3f3d3a6f783c766b3173cf1a Mon Sep 17 00:00:00 2001
+From d3000d5e451374f58b2b5649f7387761c7e640ef Mon Sep 17 00:00:00 2001
 From: Randy Witt <randy.e.witt@intel.com>
 Date: Fri, 16 Oct 2020 16:54:30 -0700
 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -9,16 +9,17 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb.
 Signed-off-by: Randy Witt <randy.e.witt@intel.com>
 
 Upstream-Status: Inappropriate [other]
-
 ---
  Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile b/Makefile
-index 223a839..a735584 100644
+index e3d02cd..be3d48e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -2,6 +2,6 @@
+@@ -2,8 +2,8 @@
+ include feature/test-feature.mak
+ 
  VERSION = 2.8
 -CC = $(CROSS_COMPILE)gcc
 -AR = $(CROSS_COMPILE)ar
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 915f8baa61..0000000000
--- 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 <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
-Cc: Clark Williams <williams@redhat.com>
-Cc: John Kacur <jkacur@redhat.com>
-Cc: rt-users <linux-rt-users@vger.kernel.org>
----
- 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 a2e8558c4c..f6a2969202 100644
--- a/meta/recipes-rt/rt-tests/rt-tests.inc
+++ b/meta/recipes-rt/rt-tests/rt-tests.inc
@@ -1,5 +1,5 @@
-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"
diff --git a/meta/recipes-rt/rt-tests/rt-tests_git.bb b/meta/recipes-rt/rt-tests/rt-tests_git.bb
index 5fa980dbdf..1565b8b451 100644
--- a/meta/recipes-rt/rt-tests/rt-tests_git.bb
+++ b/meta/recipes-rt/rt-tests/rt-tests_git.bb
@@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 require rt-tests.inc
 inherit ptest
 
-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 \
+SRC_URI += "file://run-ptest \
+           file://rt_bmark.py \
+           file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \
            "
 
 # rt-tests needs PI mutex support in libc
-- 
2.47.1

