From 37a5aca1a5884cda8914ff80af4fe57b1e4f11d9 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 9 Feb 2020 10:32:24 +0100 Subject: [PATCH] - updated to 1.6 - updated backfire patch --- rt-tests-backfire.patch | 11 ++++++----- rt-tests.spec | 10 ++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/rt-tests-backfire.patch b/rt-tests-backfire.patch index a77920d..823229f 100644 --- a/rt-tests-backfire.patch +++ b/rt-tests-backfire.patch @@ -33,13 +33,14 @@ index aaf9c4a..0e9a0df 100644 1.7.5.4 Also is gone for most architectures since v3.4-rc1~54^2. ---- rt-tests-1.0/src/backfire/backfire.c.orig 2017-03-29 18:54:44.833362351 +0200 -+++ rt-tests-1.0/src/backfire/backfire.c 2017-03-29 18:56:06.890028082 +0200 -@@ -31,7 +31,6 @@ +--- rt-tests-1.6/src/backfire/backfire.c.orig 2020-02-09 10:27:54.181066040 +0100 ++++ rt-tests-1.6/src/backfire/backfire.c 2020-02-09 10:29:12.863973111 +0100 +@@ -16,8 +16,6 @@ #include + #include - #include -#include - +- #define BACKFIRE_MINOR MISC_DYNAMIC_MINOR + static DEFINE_SPINLOCK(backfire_state_lock); diff --git a/rt-tests.spec b/rt-tests.spec index 4554ed1..b3c3c7d 100644 --- a/rt-tests.spec +++ b/rt-tests.spec @@ -17,19 +17,19 @@ Summary: Programs that test various rt-linux features Summary(pl.UTF-8): Programy testujące różne właściwości rt-linuksa %define pname rt-tests Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel} -Version: 1.5 +Version: 1.6 %define rel 1 Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}} License: GPL v2 Group: Applications/System Source0: https://www.kernel.org/pub/linux/utils/rt-tests/%{pname}-%{version}.tar.xz -# Source0-md5: 306ed2ef9473a5779b846d08168b6e71 +# Source0-md5: 8f113923fa265ef314e3d5642addb202 # https://bugs.launchpad.net/ubuntu/+source/rt-tests/+bug/881771/+attachment/2572753/+files/0001-Fix-deprecated-removed-spinlock-declaration.patch # + http://www.spinics.net/lists/linux-rt-users/msg08966.html Patch0: %{pname}-backfire.patch URL: https://rt.wiki.kernel.org/index.php/Cyclictest %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}} -%ifarch %{ix86} %{x8664} x32 ia64 mipx ppc +%ifarch %{ix86} %{x8664} x32 ia64 mips ppc BuildRequires: numactl-devel %endif BuildRequires: python-modules @@ -106,8 +106,7 @@ rm -rf $RPM_BUILD_ROOT %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ prefix="%{_prefix}" \ - PYLIB="%{py_sitescriptdir}" \ - srcdir="%{_prefix}/src/%{name}-%{version}" + PYLIB="%{py_sitescriptdir}" %py_comp $RPM_BUILD_ROOT%{py_sitescriptdir} %py_ocomp $RPM_BUILD_ROOT%{py_sitescriptdir} @@ -155,4 +154,3 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/ssdd.8* %{_mandir}/man8/svsematest.8* %{py_sitescriptdir}/hwlatdetect.py* -%{_prefix}/src/%{name}-%{version} -- 2.43.0