diff --git a/.gitignore b/.gitignore index 3542b24..ef9ab3c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/stalld-1.17.1.tar.bz2 +SOURCES/stalld-1.19.1.tar.bz2 diff --git a/.stalld.metadata b/.stalld.metadata index 1288e53..f09b2c5 100644 --- a/.stalld.metadata +++ b/.stalld.metadata @@ -1 +1 @@ -449566fc8c5f8568a92ed0a04d15c31d64878741 SOURCES/stalld-1.17.1.tar.bz2 +5830e75cdc32cf0953ce9f223c9074681211c0d8 SOURCES/stalld-1.19.1.tar.bz2 diff --git a/SOURCES/Start-stalld-service-as-initrc_t.patch b/SOURCES/Start-stalld-service-as-initrc_t.patch index 4a88577..92b624f 100644 --- a/SOURCES/Start-stalld-service-as-initrc_t.patch +++ b/SOURCES/Start-stalld-service-as-initrc_t.patch @@ -1,6 +1,6 @@ -From 476152742021303d2defeb69f524bcc302618081 Mon Sep 17 00:00:00 2001 -From: Leah Leshchinsky -Date: Mon, 29 Aug 2022 14:07:39 -0400 +From c93cef85e7ec08d924ad6a4f90a8677cc1603950 Mon Sep 17 00:00:00 2001 +From: John Kacur +Date: Wed, 14 Feb 2024 15:55:30 -0500 Subject: [PATCH] Start stalld service as initrc_t Stalld currently runs as an unconfined_service_t. @@ -8,12 +8,16 @@ Stalld currently runs as an unconfined_service_t. Edit to service file so that the daemon is launched as an initrc_t. Signed-off-by: Leah Leshchinsky +Signed-off-by: John Kacur +--- + systemd/stalld.service | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/redhat/stalld.service b/redhat/stalld.service -index e0eb4b77b0a7..bcd4b767f629 100644 ---- a/redhat/stalld.service -+++ b/redhat/stalld.service -@@ -9,7 +9,7 @@ ExecStartPre=/usr/bin/throttlectl off +diff --git a/systemd/stalld.service b/systemd/stalld.service +index d93110b1b43e..69f3ee728129 100644 +--- a/systemd/stalld.service ++++ b/systemd/stalld.service +@@ -10,7 +10,7 @@ ExecStartPre=/usr/bin/throttlectl off # In case the regex passed to IT or IP includes C escape sequences, # use ${IT} or ${IP} instead of $IT or $IP @@ -23,5 +27,5 @@ index e0eb4b77b0a7..bcd4b767f629 100644 CPUSchedulingPolicy=fifo CPUSchedulingPriority=10 -- -2.31.1 +2.43.0 diff --git a/SPECS/stalld.spec b/SPECS/stalld.spec index b7acb9d..5cc0f2e 100644 --- a/SPECS/stalld.spec +++ b/SPECS/stalld.spec @@ -1,6 +1,6 @@ Name: stalld -Version: 1.17.1 -Release: 1%{?dist} +Version: 1.19.1 +Release: 4%{?dist} Summary: Daemon that finds starving tasks and gives them a temporary boost License: GPLv2 @@ -14,7 +14,16 @@ BuildRequires: systemd-rpm-macros Requires: systemd -Patch0: Start-stalld-service-as-initrc_t.patch +%ifnarch i686 +BuildRequires: bpftool +BuildRequires: clang +BuildRequires: libbpf-devel +BuildRequires: llvm + +Requires: libbpf +%endif + +Patch0: Start-stalld-service-as-initrc_t.patch %description The stalld program monitors the set of system threads, @@ -32,7 +41,7 @@ allow 10 microseconds of runtime for 1 second of clock time. %install %make_install DOCDIR=%{_docdir} MANDIR=%{_mandir} BINDIR=%{_bindir} DATADIR=%{_datadir} VERSION=%{version} -%make_install -C redhat UNITDIR=%{_unitdir} +%make_install -C systemd UNITDIR=%{_unitdir} %files %{_bindir}/%{name} @@ -53,6 +62,22 @@ allow 10 microseconds of runtime for 1 second of clock time. %systemd_postun_with_restart %{name}.service %changelog +* Wed Feb 14 2024 John Kacur - 1.19.1-4 +- Put back patch to run stalld service as initrc_t +Resolves: RHEL-8982 + +* Mon Feb 12 2024 John Kacur - 1.19.1-3 +- Copying over missing tests directory +Resolves: RHEL-8982 + +* Mon Feb 12 2024 John Kacur - 1.19.1-2 +- Add llvm as a build requirement +Resolves: RHEL-8982 + +* Fri Feb 09 2024 John Kacur - 1.19.1-1 +- Rebase to v1.19.1 upstream +Resolves: RHEL-8982 + * Tue Oct 18 2022 Leah Leshchinsky - 1.17.1-1 - stalld: Fix memory leak in print_boosted_info() - utils: Check if the system is in lockdown mode