.gitignore

@@ -1 +1,6 @@
-SOURCES/realtime-setup-2.2.tar.bz2
+/realtime-setup-2.1.tar.bz2
+/realtime-setup-2.2.tar.bz2
+/realtime-setup-v2.2.3.tar.bz2
+/realtime-setup-v2.3.1.tar.bz2
+/realtime-setup-v2.3.2.tar.bz2
+/realtime-setup-2.4.tar.bz2

.realtime-setup.metadata

@@ -1 +0,0 @@
-9d09c9489468a250c6e7bae3ea840a0a12d54f79 SOURCES/realtime-setup-2.2.tar.bz2

Makefile

@@ -0,0 +1,52 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+VERSION	:=	2.4
+$(info "Version: $(VERSION)")
+
+CC	:=	gcc
+ifeq ($(CFLAGS),)
+CFLAGS	:= 	-O3 -g -Wall -D_GNU_SOURCE \
+		-fstack-protector-all -fcf-protection \
+		-fstack-clash-protection
+endif
+CFLAGS  +=	-fPIC -fplugin=annobin
+LDFLAGS +=	-Wl,-z,now -Wl,-z,relro -pie
+
+FILES	:=	slub_cpu_partial_off 	\
+		rhel-rt.rules 		\
+		kernel-is-rt 		\
+		realtime-setup.sysconfig 	\
+		realtime-setup.systemd 	\
+		realtime.conf 		\
+		realtime-entsk.service 	\
+		realtime-setup.service	\
+		realtime-setup.spec
+
+EXT 	:=	bz2
+TARBALL	:=	realtime-setup-v$(VERSION).tar.$(EXT)
+
+all:  realtime-entsk
+
+realtime-entsk: enable-netsocket-tstamp-static-key.c
+	$(CC) $(CFLAGS) -c enable-netsocket-tstamp-static-key.c
+	$(CC) $(LDFLAGS) -o realtime-entsk enable-netsocket-tstamp-static-key.o
+
+clean:
+	rm -f *~ *.tar.$(EXT)
+	rm -rf rpm
+	rm -f realtime-entsk *.o
+
+tarball:
+	rm -f *.tar.$(EXT)
+	git archive --format=tar --prefix=realtime-setup-v$(VERSION)/ HEAD | \
+		bzip2 >realtime-setup-v$(VERSION).tar.$(EXT)
+
+install:
+	install -m 755 -D slub_cpu_partial_off $(DEST)/usr/bin/slub_cpu_partial_off
+	install -m 644 -D rhel-rt.rules $(DEST)/etc/udev/rules.d/99-rhel-rt.rules
+	install -m 755 -D kernel-is-rt $(DEST)/usr/sbin/kernel-is-rt
+	install -m 644 -D realtime-setup.sysconfig $(DEST)/etc/sysconfig/realtime-setup
+	install -m 755 -D realtime-setup.systemd $(DEST)/usr/bin/realtime-setup
+	install -m 644 -D realtime.conf $(DEST)/etc/security/limits.d/realtime.conf
+	install -m 644 -D realtime-entsk.service $(DEST)/usr/lib/systemd/system/realtime-entsk.service
+	install -m 755 -D -s realtime-entsk $(DEST)/usr/sbin/realtime-entsk
+	install -m 644 -D realtime-setup.service $(DEST)/usr/lib/systemd/system/realtime-setup.service

SOURCES/remove-strip-of-realtime-entsk-and-generate-debuginf.patch

@@ -1,49 +0,0 @@
-From 9fce13856a7c4dbd55fed37edd9d5a8102bd98de Mon Sep 17 00:00:00 2001
-From: Clark Williams <williams@redhat.com>
-Date: Wed, 11 May 2022 16:28:46 -0500
-Subject: [PATCH] remove strip of realtime-entsk and generate debuginfo
-
-Resolves:  rhbz#2068534
-
-Removed '-s' argument to install to prevent stripping of realtime-entsk
-Removed %global definition of debug_package to '%{nil}' that explicitly
-turned off debuginfo generation
-
-Signed-off-by: Clark Williams <williams@redhat.com>
----
- Makefile            | 2 +-
- realtime-setup.spec | 5 -----
- 2 files changed, 1 insertion(+), 6 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f4a6f030c8a2..8e8a74d1e5d0 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ install:
- 	install -m 755 -D realtime-setup.systemd $(DEST)/usr/bin/realtime-setup
- 	install -m 644 -D realtime.conf $(DEST)/etc/security/limits.d/realtime.conf
- 	install -m 644 -D realtime-entsk.service $(DEST)/usr/lib/systemd/system/realtime-entsk.service
--	install -m 755 -D -s realtime-entsk $(DEST)/usr/sbin/realtime-entsk
-+	install -m 755 -D realtime-entsk $(DEST)/usr/sbin/realtime-entsk
- 	install -m 644 -D realtime-setup.service $(DEST)/usr/lib/systemd/system/realtime-setup.service
- 
- dist-git: tarball
-diff --git a/realtime-setup.spec b/realtime-setup.spec
-index 64c3f3a3fa52..402f66de24bf 100644
---- a/realtime-setup.spec
-+++ b/realtime-setup.spec
-@@ -18,11 +18,6 @@ Requires: tuned
- Requires: tuned-profiles-realtime
- Requires: systemd
- 
--# disable generation of debuginfo packages for this package
--# the only executable from this package is realtime-entsk and it's not really
--# something that requires debugging.
--%global debug_package %{nil}
--
- %description
- Configure details useful for low-latency environments.
- 
--- 
-2.36.1
-

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-10
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

realtime-setup.spec

@@ -1,26 +1,26 @@
 Name: realtime-setup
-Version: 2.2
+Version: 2.4
 Release: 6%{?dist}
-License: GPLv2
+License: GPL-2.0-or-later
 Summary: Setup RT/low-latency environment details
-Source0: https://jcwillia.fedorapeople.org/realtime-setup-%{version}.tar.bz2
+Source0: https://gitlab.com/rt-linux-tools/%{name}/-/archive/v%{version}/%{name}-%{version}.tar.bz2
 URL:  https://gitlab.com/rt-linux-tools/realtime-setup.git
 
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
-BuildRequires: annobin
+BuildRequires: annobin-plugin-gcc
 Requires: pam
-Requires: kexec-tools
 Requires: tuna
 Requires: tuned
 Requires: tuned-profiles-realtime
 Requires: systemd
 
-# Patches
-Patch1: remove-strip-of-realtime-entsk-and-generate-debuginf.patch
-
+# disable generation of debuginfo packages for this package
+# the only executable from this package is realtime-entsk and it's not really
+# something that requires debugging.
+%global debug_package %{nil}
 
 %description
 Configure details useful for low-latency environments.
@@ -45,8 +45,7 @@ Neither the slub script or realtime-entsk are active by default.
 
 
 %prep
-%setup -q
-%patch1 -p1
+%setup -q -n %{name}-%{version}
 
 
 %build
@@ -71,20 +70,51 @@ Neither the slub script or realtime-entsk are active by default.
 %{_unitdir}/realtime-setup.service
 %{_bindir}/realtime-setup
 %{_unitdir}/realtime-entsk.service
-%license gpl-2.0.txt
 
 %changelog
-* Thu May 19 2022 John Kacur <jkacur@redhat.com> - 2.2-6
-- Remove '-s' argument to install to prevent stripping of realtime-entsk
-Resolves: rhbz#2068534
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.4-6
+- Bump release for June 2024 mass rebuild
 
-* Mon Jan 17 2022 John Kacur <jkacur@redhat.com> - 2.2-5
-- Rebuild for rhel-9.0
-Resolves: rhbz#2041542
+* Tue Jun  4 2024 Clark Williams <williams@redhat.com> - 2.4.5
+- change gating.yaml target from rhel-9 to rhel-10
+Resolves: RHEL-40030
 
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.2-4
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Mar 26 2024 John Kacur <jkacur@redhat.com> - 2.4-4
+- Add gating.yaml
+- Add tests dir
+Resolves: RHEL-30448
+
+* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Tue Dec 05 2023 Clark Williams <williams@redhat.com> - 2.4-1
+- Makefile cleanups and added .gitignore
+- remove Red Hat Makefile targets and specfile
+- ensure all files have valid SPDX license identifiers
+- version bump
+
+* Thu Jul 27 2023 Clark Williams <williams@redhat.com> - 2.3.2-1
+- Remove rpm specific logic from Makefile
+- Remove unused SysVinit script
+- version bump
+
+* Wed Jul 05 2023 Clark Williams <williams@redhat.com> - 2.3.1-1
+- Fix build require of annobin package
+- Update all files with SPDX identifier
+- add srpm target in Makefile
+- fix versioning in Makefile targets and specfile
+
+* Thu Jul 14 2022 Jiri Kastner<jkastner@fedoraproject.org> - 2.2.3-1
+- polish source url
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * Wed May 26 2021 Clark Williams <williams@redhat.com> - 2.2-3
 - pidfile error from renaming. Resolves rhbz##1891048

sources

@@ -0,0 +1 @@
+SHA512 (realtime-setup-2.4.tar.bz2) = cba3ce1db9a0b9dc50dc749bff839a63408a15dea6569f5869c4a8cd2f4a6bfcf3b1c913926706f45fd88edcfd512a7c7a2ec15f6fd1ec2f06d5c647cd276347

tests/scripts/run_tests.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/bash
+
+# make sure we have rt-setup installed
+if rpm -q --quiet realtime-setup; then
+    :
+else
+    cat <<EOF > /etc/yum.repos.d/centos-stream-rt.repo
+[centos-stream-rt]
+name=CentOS Stream latest Realtime compose
+baseurl=http://composes.stream.centos.org/test/latest-CentOS-Stream/compose/RT/\$basearch/os/
+enabled=1
+gpgcheck=0
+metadata_expire=6h
+skip_if_unavailable=False
+EOF
+    sudo dnf install -y realtime-setup
+    if [[ $? != 0 ]]; then
+       echo "install of realtime-setup failed!"
+       exit 1
+    fi
+fi
+
+# check bins
+for p in realtime-setup slub_cpu_partial_off; do
+    prog=/usr/bin/$p
+    if [[ ! -e $prog ]]; then
+       echo "$prog not found"
+       exit 2
+    fi
+    if [[ ! -x $prog ]]; then
+       echo "$prog not executable!"
+       exit 3
+    fi
+done
+
+# check system bins
+for p in kernel-is-rt realtime-entsk; do
+    prog=/usr/sbin/$p
+    if [[ ! -e $prog ]]; then
+       echo "$prog not found"
+       exit 4
+    fi
+    if [[ ! -x $prog ]]; then
+       echo "$prog not executable!"
+       exit 5
+    fi
+done
+
+# check /etc files
+if [[ ! -e /etc/security/limits.d/realtime.conf ]]; then
+    echo "/etc/security/limits.d/realtime.conf: not found"
+    exit 6
+fi
+if [[ ! -e /etc/sysconfig/realtime-setup ]]; then
+    echo "/etc/sysconfig/realtime-setup: not found"
+    exit 7
+fi
+if [[ ! -e /etc/udev/rules.d/99-rhel-rt.rules ]]; then
+    echo "/etc/udev/rules.d/99-rhel-rt.rules: not found"
+    exit 8
+fi
+
+# check systemd service files
+for i in realtime-entsk realtime-setup; do
+    serv="/usr/lib/systemd/system/$i.service"
+    if [[ ! -e $serv ]]; then
+       echo "$serv: not found"
+       exit 9
+    fi
+done
+
+exit 0

tests/tests.yml

@@ -0,0 +1,11 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - simple:
+        dir: scripts
+        run: ./run_tests.sh
+    required_packages:
+    - realtime-setup