[packages/rt-tests] - added fix for glibc 2.41 from git; release 4

qboosh qboosh at pld-linux.org
Tue Apr 1 20:14:49 CEST 2025


commit 9475ca169179184a1e8358a3557f0b89e741b558
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Apr 1 19:59:55 2025 +0200

    - added fix for glibc 2.41 from git; release 4

 rt-tests-glibc2.41.patch | 56 ++++++++++++++++++++++++++++++++++++++++++++++++
 rt-tests.spec            |  5 ++++-
 2 files changed, 60 insertions(+), 1 deletion(-)
---
diff --git a/rt-tests.spec b/rt-tests.spec
index 24a76cd..2c91ccf 100644
--- a/rt-tests.spec
+++ b/rt-tests.spec
@@ -18,7 +18,7 @@ Summary(pl.UTF-8):	Programy testujące różne właściwości rt-linuksa
 %define	pname	rt-tests
 Name:		%{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
 Version:	2.8
-%define	rel	3
+%define	rel	4
 Release:	%{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
 License:	GPL v2
 Group:		Applications/System
@@ -27,6 +27,8 @@ Source0:	https://www.kernel.org/pub/linux/utils/rt-tests/%{pname}-%{version}.tar
 # https://bugs.launchpad.net/ubuntu/+source/rt-tests/+bug/881771/+attachment/2572753/+files/0001-Fix-deprecated-removed-spinlock-declaration.patch
 # + http://www.spinics.net/lists/linux-rt-users/msg08966.html
 Patch0:		%{pname}-backfire.patch
+# https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/patch/?id=d3a23a0cc76789c3083df3bad78982cd49bc4c5e
+Patch1:		%{pname}-glibc2.41.patch
 URL:		https://rt.wiki.kernel.org/index.php/Cyclictest
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
 %ifarch %{ix86} %{x8664} x32 ia64 mips ppc
@@ -88,6 +90,7 @@ dostarczania sygnałów.\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch -P0 -p1
+%patch -P1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' src/cyclictest/get_cyclictest_snapshot.py
 
diff --git a/rt-tests-glibc2.41.patch b/rt-tests-glibc2.41.patch
new file mode 100644
index 0000000..f34973d
--- /dev/null
+++ b/rt-tests-glibc2.41.patch
@@ -0,0 +1,56 @@
+From d3a23a0cc76789c3083df3bad78982cd49bc4c5e Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi at redhat.com>
+Date: Wed, 29 Jan 2025 16:46:11 -0500
+Subject: Fix rt-tests build with glibc-2.41
+
+The sched_*attr APIs were added to glibc
+https://sourceware.org/git/?p=glibc.git;a=commit;h=21571ca0d70302909cf72707b2a7736cf12190a0
+
+This fixes the build conflict in rt-tests with glibc-2.4
+
+Signed-off-by: Yaakov Selkowitz <yselkowi at redhat.com>
+Signed-off-by: John Kacur <jkacur at redhat.com>
+---
+ src/include/rt-sched.h | 2 ++
+ src/lib/rt-sched.c     | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h
+index 80171c7..dfd7f45 100644
+--- a/src/include/rt-sched.h
++++ b/src/include/rt-sched.h
+@@ -42,6 +42,7 @@
+ #define __NR_sched_getattr		275
+ #endif
+ 
++#if ! __GLIBC_PREREQ(2, 41)
+ struct sched_attr {
+ 	uint32_t size;
+ 	uint32_t sched_policy;
+@@ -67,5 +68,6 @@ int sched_getattr(pid_t pid,
+ 		  struct sched_attr *attr,
+ 		  unsigned int size,
+ 		  unsigned int flags);
++#endif
+ 
+ #endif /* __RT_SCHED_H__ */
+diff --git a/src/lib/rt-sched.c b/src/lib/rt-sched.c
+index 8023bc7..2500abd 100644
+--- a/src/lib/rt-sched.c
++++ b/src/lib/rt-sched.c
+@@ -14,6 +14,7 @@
+ 
+ #include "rt-sched.h"
+ 
++#if ! __GLIBC_PREREQ(2, 41)
+ int sched_setattr(pid_t pid,
+ 		  const struct sched_attr *attr,
+ 		  unsigned int flags)
+@@ -28,3 +29,4 @@ int sched_getattr(pid_t pid,
+ {
+ 	return syscall(__NR_sched_getattr, pid, attr, size, flags);
+ }
++#endif
+-- 
+cgit 1.2.3-korg
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rt-tests.git/commitdiff/9475ca169179184a1e8358a3557f0b89e741b558



More information about the pld-cvs-commit mailing list