From 697de2662bfc11aa5cf0201b23cab2036251f884 Mon Sep 17 00:00:00 2001 From: John Kacur Date: Fri, 1 Dec 2023 18:51:14 -0500 Subject: [PATCH] Update to latest version upstream v2.6 Include SPDX changes --- .gitignore | 4 ++ realtime-tests.spec | 16 ++++-- ...e-Use-sysconfig-instead-of-distutils.patch | 55 ------------------- ...e_test-Fix-spelling-to-single-in-com.patch | 30 ---------- ...tect-Add-field-cpu-to-samples-output.patch | 42 -------------- sources | 5 +- 6 files changed, 18 insertions(+), 134 deletions(-) delete mode 100644 rt-tests-Makefile-Use-sysconfig-instead-of-distutils.patch delete mode 100644 rt-tests-deadline_test-Fix-spelling-to-single-in-com.patch delete mode 100644 rt-tests-hwlatdetect-Add-field-cpu-to-samples-output.patch diff --git a/.gitignore b/.gitignore index ab92fe7..35943a3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ /rt-tests-2.3.tar.xz /rt-tests-2.4.tar.xz /rt-tests-2.5.tar.xz +/rt-tests-2.6.tar.xz +/0001-rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch +/0002-rt-tests-Add-missing-SPDX-licenses.patch +/0003-rt-tests-Remove-remaining-unnecessary-texts-after-ad.patch diff --git a/realtime-tests.spec b/realtime-tests.spec index 5bd46fe..6426f5a 100644 --- a/realtime-tests.spec +++ b/realtime-tests.spec @@ -1,8 +1,8 @@ Name: realtime-tests Summary: Programs that test various rt-features -Version: 2.5 -Release: 3%{?dist} -License: GPLv2 +Version: 2.6 +Release: 1%{?dist} +License: GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-only AND LGPL-2.1-or-later URL: https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git Source0: https://www.kernel.org/pub/linux/utils/rt-tests/rt-tests-%{version}.tar.xz @@ -15,9 +15,9 @@ Requires: bash Requires: bc #Patches -Patch1: rt-tests-deadline_test-Fix-spelling-to-single-in-com.patch -Patch2: rt-tests-hwlatdetect-Add-field-cpu-to-samples-output.patch -Patch3: rt-tests-Makefile-Use-sysconfig-instead-of-distutils.patch +Patch1: 0001-rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch +Patch2: 0002-rt-tests-Add-missing-SPDX-licenses.patch +Patch3:0003-rt-tests-Remove-remaining-unnecessary-texts-after-ad.patch %description realtime-tests is a set of programs that test and measure various components of @@ -76,6 +76,10 @@ latency. It also tests the functioning of priority-inheritance mutexes. %{_mandir}/man8/determine_maximum_mpps.8.* %changelog +* Fri Dec 01 2023 John Kacur - 2.6-1 +- Update to latest version upstream v2.6 +- Include SPDX changes + * Fri Jul 21 2023 Fedora Release Engineering - 2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/rt-tests-Makefile-Use-sysconfig-instead-of-distutils.patch b/rt-tests-Makefile-Use-sysconfig-instead-of-distutils.patch deleted file mode 100644 index 0cb0de5..0000000 --- a/rt-tests-Makefile-Use-sysconfig-instead-of-distutils.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eb18c75481745cc482b9d968811c626cff54d00f Mon Sep 17 00:00:00 2001 -From: John Kacur -Date: Wed, 15 Feb 2023 17:10:37 -0500 -Subject: [PATCH 3/3] rt-tests: Makefile: Use sysconfig instead of distutils - for PYLIB - -Use sysconfig instead of distutils for PYLIB -Version 2 takes into consideration that different versions of python -produce different results. - -Signed-off-by: John Kacur ---- - Makefile | 2 +- - get_pylib.py | 16 ++++++++++++++++ - 2 files changed, 17 insertions(+), 1 deletion(-) - create mode 100755 get_pylib.py - -diff --git a/Makefile b/Makefile -index 4df61ece123b..32a9f41198a4 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ CFLAGS ?= -Wall -Wno-nonnull -Wextra - CPPFLAGS += -D_GNU_SOURCE -Isrc/include - LDFLAGS ?= - --PYLIB ?= $(shell python3 -c 'import distutils.sysconfig; print (distutils.sysconfig.get_python_lib())') -+PYLIB ?= $(shell python3 -m get_pylib) - - # Check for errors, such as python3 not available - ifeq (${PYLIB},) -diff --git a/get_pylib.py b/get_pylib.py -new file mode 100755 -index 000000000000..56253d589fe4 ---- /dev/null -+++ b/get_pylib.py -@@ -0,0 +1,16 @@ -+#!/usr/bin/python3 -+ -+# This file is used during the make process -+ -+import sysconfig -+ -+# Older versions of python don't have this scheme -+# but produce the answer we expect with 'posix_prefix' -+# Newer versions of python insert 'local' in the path unless we use rpm_prefix -+SCHEME = 'rpm_prefix' -+ -+if not SCHEME in sysconfig.get_scheme_names(): -+ SCHEME = 'posix_prefix' -+ -+PYLIB = sysconfig.get_path('purelib', SCHEME) -+print(PYLIB) --- -2.39.1 - diff --git a/rt-tests-deadline_test-Fix-spelling-to-single-in-com.patch b/rt-tests-deadline_test-Fix-spelling-to-single-in-com.patch deleted file mode 100644 index 8ee631d..0000000 --- a/rt-tests-deadline_test-Fix-spelling-to-single-in-com.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 37b70ea17d5479505cebed409087c6cd28c1a485 Mon Sep 17 00:00:00 2001 -From: John Kacur -Date: Fri, 10 Feb 2023 14:57:38 -0500 -Subject: [PATCH 1/3] rt-tests: deadline_test: Fix spelling to "single" in - comment - -Fix the spelling in the comments before bind_cpu() -from "sigle" to "single". - -Signed-off-by: John Kacur ---- - src/sched_deadline/deadline_test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sched_deadline/deadline_test.c b/src/sched_deadline/deadline_test.c -index 731073e85180..cd8ef01f7d68 100644 ---- a/src/sched_deadline/deadline_test.c -+++ b/src/sched_deadline/deadline_test.c -@@ -931,7 +931,7 @@ static void teardown(void) - * bind_cpu - Set the affinity of a thread to a specific CPU. - * @cpu: The CPU to bind to. - * -- * Sets the current thread to have an affinity of a sigle CPU. -+ * Sets the current thread to have an affinity of a single CPU. - * Does not work on SCHED_DEADLINE tasks. - */ - static void bind_cpu(int cpu) --- -2.39.1 - diff --git a/rt-tests-hwlatdetect-Add-field-cpu-to-samples-output.patch b/rt-tests-hwlatdetect-Add-field-cpu-to-samples-output.patch deleted file mode 100644 index 0017cf6..0000000 --- a/rt-tests-hwlatdetect-Add-field-cpu-to-samples-output.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 96e78093832288b705c507b1ee443aeffe126bba Mon Sep 17 00:00:00 2001 -From: Costa Shulyupin -Date: Mon, 13 Feb 2023 19:11:36 +0200 -Subject: [PATCH 2/3] rt-tests: hwlatdetect: Add field cpu to samples output - -Information about CPU index is valuable for debugging -latency issues - -Signed-off-by: John Kacur ---- - src/hwlatdetect/hwlatdetect.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/hwlatdetect/hwlatdetect.py b/src/hwlatdetect/hwlatdetect.py -index 68df58f7e2d0..dc28f38b751a 100755 ---- a/src/hwlatdetect/hwlatdetect.py -+++ b/src/hwlatdetect/hwlatdetect.py -@@ -237,10 +237,11 @@ class Tracer(Detector): - - class Sample: - 'private class for tracer sample data' -- __slots__ = 'timestamp', 'inner', 'outer' -+ __slots__ = 'cpu', 'timestamp', 'inner', 'outer' - - def __init__(self, line): - fields = line.split() -+ self.cpu = int(fields[1][1:-1]) - i, o = fields[6].split('/') - ts = fields[7][3:] - self.timestamp = str(ts) -@@ -248,7 +249,7 @@ class Tracer(Detector): - self.outer = int(o) - - def __str__(self): -- return f"ts: {self.timestamp}, inner:{self.inner}, outer:{self.outer}" -+ return f"ts: {self.timestamp}, inner:{self.inner}, outer:{self.outer}, cpu:{self.cpu}" - - def display(self): - """ convert object to string and print """ --- -2.39.1 - diff --git a/sources b/sources index 62c0960..840738d 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ -SHA512 (rt-tests-2.5.tar.xz) = 4341716aa1a307aeb9f11e922da814ff6f1e16f7a4b9ba05bcc8a3972f411f4b4f8212ffe58bdaa025e164d1ddcfcc199fdb2b53bfe051d58cfd898a751dcc25 +SHA512 (rt-tests-2.6.tar.xz) = 4d6a309d0d1ccc395b6789da68db62637150cfadb100bc4b259e81e88ab3de03714d93528e0dd3c1f775dfdff0e91f6076e75f7cf08f7d77b0d9d692df66f221 +SHA512 (0001-rt-tests-Makefile-Restore-support-for-Exuberant-Ctag.patch) = b0f14e63264b515a69ffa354af609c2534e9878d1a583f494d0cbdb7a6e0edc414887e5f19e77d2f8192a2fc1c0622b9c5a8bf1d674ad5cb42d5d3cbb30cf989 +SHA512 (0002-rt-tests-Add-missing-SPDX-licenses.patch) = d0de818b1bd4baf633d299c4e404fd5ee8e6c3f4a81f3bad175b541f3be4e4fe32bd23adb34063e6d3367998dc0017ce9dc5fc27c96ef6f7d86e24a7f2146b21 +SHA512 (0003-rt-tests-Remove-remaining-unnecessary-texts-after-ad.patch) = 07a3cf1e03d0b029d9b36738346494066648e3b3d5768952e05db5cb8ec8077dcb37aeec483091cabed677d9a389f0a32cb048a9d5d7cdd057d6d6a985d52ff1