From eabbddc7ecdb2f6731f6c1b8dfaca52880af4444 Mon Sep 17 00:00:00 2001 From: Wander Lairson Costa Date: Thu, 17 Jul 2025 12:29:55 -0300 Subject: [PATCH] Rebase to stalld-1.20.2 Resolves: RHEL-96213 RHEL-96227 RHEL-104106 Signed-off-by: Wander Lairson Costa --- .gitignore | 1 + sources | 2 +- ...ed_attr-Do-not-define-for-glibc-2.41.patch | 33 ------------------- stalld.spec | 12 ++++--- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 stalld-sched_attr-Do-not-define-for-glibc-2.41.patch diff --git a/.gitignore b/.gitignore index 78b45cd..a26b459 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /stalld-1.19.6.tar.bz2 /stalld-1.19.8.tar.gz /stalld-1.19.8.tar.bz2 +/stalld-1.20.2.tar.gz diff --git a/sources b/sources index 6d0859a..2e4677f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (stalld-1.19.8.tar.bz2) = 349b715912d01544736102c79364d77de2a1e8b793bfd8613bfc3f19c874e8db63b54653eaa3fe831ff9ef6f721b85d180ea7b79a1d414246909700a96ce996e +SHA512 (stalld-1.20.2.tar.gz) = b0715cbcb6e1b789c763b44d3d5024bb5a7ecd276cd056a883fe6451075aaad9c70f951903a7e2cbbf2a0c76d4e97500d7c2218123d321bfb561a8ee53821f0b diff --git a/stalld-sched_attr-Do-not-define-for-glibc-2.41.patch b/stalld-sched_attr-Do-not-define-for-glibc-2.41.patch deleted file mode 100644 index 72ac69e..0000000 --- a/stalld-sched_attr-Do-not-define-for-glibc-2.41.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b79c1777ee16901b3d27cd25e50435f4f060cfa8 Mon Sep 17 00:00:00 2001 -From: John Kacur -Date: Thu, 22 May 2025 11:33:07 -0400 -Subject: [PATCH] stalld: sched_attr: Do not define for glibc >= 2.41 - -glibc >=2.41 has definitions for struct sched_attr and -sched_setattr and sched_getattr - -Sometimes this is backported by distributions so define conditionally on -SCHED_ATTR_SIZE_VER0 - -Signed-off-by: John Kacur ---- - src/stalld.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/stalld.h b/src/stalld.h -index 0c4dcee503ca..7b4d7e60f5f7 100644 ---- a/src/stalld.h -+++ b/src/stalld.h -@@ -110,7 +110,8 @@ struct stalld_backend { - void (*destroy)(void); - }; - --#if ! __GLIBC_PREREQ(2, 41) && !defined(GLIBC_HAS_SCHED_ATTR) -+/* sched_attr is not defined in glibc < 2.41, unless backported */ -+#ifndef SCHED_ATTR_SIZE_VER0 - - #ifdef __x86_64__ - # define __NR_sched_setattr 314 --- -2.49.0 - diff --git a/stalld.spec b/stalld.spec index 1792b41..66fb133 100644 --- a/stalld.spec +++ b/stalld.spec @@ -1,16 +1,17 @@ Name: stalld -Version: 1.19.8 +Version: 1.20.2 Release: 2%{?dist} Summary: Daemon that finds starving tasks and gives them a temporary boost License: GPLv2 -URL: https://gitlab.com/rt-linux-tools/%{name}/%{name}.git -Source0: https://gitlab.com/rt-linux-tools/%{name}/-/archive/v%{version}/%{name}-%{version}.tar.bz2 +URL: https://git.kernel.org/pub/scm/utils/%{name}/%{name}.git +Source0: https://git.kernel.org/pub/scm/utils/%{name}/%{name}.git/snapshot/%{name}-%{version}.tar.gz BuildRequires: glibc-devel BuildRequires: gcc BuildRequires: make BuildRequires: systemd-rpm-macros +BuildRequires: llvm Requires: systemd @@ -23,7 +24,6 @@ Requires: libbpf %endif # Patches -Patch1: stalld-sched_attr-Do-not-define-for-glibc-2.41.patch %define _hardened_build 1 @@ -64,6 +64,10 @@ allow 10 microseconds of runtime for 1 second of clock time. %systemd_postun_with_restart %{name}.service %changelog +* Thu Jul 16 2025 Wander Lairson Costa - 1.20.2 +- Rebase to stalld-1.20.2 +Resolves: RHEL-96213 RHEL-96227 RHEL-104106 + * Thu May 22 2025 John Kacur - 1.19.8-2 - Check if sched_attr is in glibc Resolves: RHEL-92952