Compare commits

...

No commits in common. "imports/c8/rt-setup-2.1-2.el8" and "c8-beta" have entirely different histories.

2 changed files with 47 additions and 4 deletions

View File

@ -0,0 +1,28 @@
From f29bccfe2e3610a4bd10e01188ec869be100f2ce Mon Sep 17 00:00:00 2001
From: John Kacur <jkacur@redhat.com>
Date: Thu, 19 May 2022 14:27:51 -0400
Subject: [PATCH] rt-setup: remove strip of rt-entsk
Remove '-s' argument from the install command for rt-entsk
Signed-off-by: John Kacur <jkacur@redhat.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index a1cda5cb2510..a86c927a1217 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ install:
install -m 755 -D rt-setup.systemd $(DEST)/usr/bin/rt-setup
install -m 644 -D realtime.conf $(DEST)/etc/security/limits.d/realtime.conf
install -m 644 -D rt-entsk.service $(DEST)/usr/lib/systemd/system/rt-entsk.service
- install -m 755 -D -s rt-entsk $(DEST)/usr/sbin/rt-entsk
+ install -m 755 -D rt-entsk $(DEST)/usr/sbin/rt-entsk
install -m 644 -D rt-setup.service $(DEST)/usr/lib/systemd/system/rt-setup.service
dist-git: tarball
--
2.36.1

View File

@ -1,6 +1,6 @@
Name: rt-setup
Version: 2.1
Release: 2%{?dist}
Release: 5%{?dist}
License: GPL+
Summary: Setup RHEL-RT environment details
Group: System Environment/Base
@ -19,7 +19,9 @@ Requires: tuned
Requires: tuned-profiles-realtime
Requires: systemd
%global debug_package %{nil}
# Patches
Patch1: rt-setup-remove-strip-of-rt-entsk.patch
%description
The 'rt-setup' package configures details required by RHEL-RT environment.
@ -32,6 +34,7 @@ The 'rt-setup' package configures details required by RHEL-RT environment.
%prep
%setup
%patch1 -p1
%build
%set_build_flags
@ -44,7 +47,7 @@ make DEST=%{buildroot} install
%post
/usr/sbin/groupadd -f -g 71 realtime
if grep kernel.hung_task_panic /etc/sysctl.conf >/dev/null 2>&1
if grep kernel.hung_task_panic /etc/sysctl.conf /etc/sysctl.d/* >/dev/null 2>&1
then
:
else
@ -57,7 +60,7 @@ kernel.hung_task_panic = 0
EOF
fi
if grep kernel.hung_task_timeout_secs /etc/sysctl.conf >/dev/null 2>&1
if grep kernel.hung_task_timeout_secs /etc/sysctl.conf /etc/sysctl.d/* >/dev/null 2>&1
then
:
else
@ -95,6 +98,18 @@ rm -rf %{buildroot}
%attr(0644, root, root) %{_unitdir}/rt-entsk.service
%changelog
* Wed Mar 22 2023 John Kacur <jkacur@redhat.com> - 2.1-5
- Build with fix for rt-setup post script
Resolves: rhbz#2168478
* Thu May 19 2022 John Kacur <jkacur@redhat.com> - 2.1-4
- Remove '-s' argument to install to prevent stripping of rt-entsk
Resolves: rhbz#2068537
* Wed Jan 19 2022 John Kacur <jkacur@redhat.com> - 2.1-3
- Rebuild for rhel-8.6, no functional change
Resolves: rhbz#2042221
* Mon Apr 01 2019 Clark Williams <williams@redhat.com> 2.1-2
- added gating.yaml to turn on OSCI gating
Resolves: rhbz#1682427