[debian] refresh patches and update version in d/changelog

8 files changed, 25 insertions, 129 deletions

diff --git a/debian/changelog b/debian/changelog
index bda433c..1b22acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,16 @@
-rt-tests (1.0-4) UNRELEASED; urgency=medium
+rt-tests (1.5-1) UNRELEASED; urgency=medium
 
   * Fix selection for building with or without NUMA (Closes: #930836)
+  * New upstream release making several patches unnecessary:
+    - dont-build-backfile: done independently in commit 2829763fdd79
+      ("rt-tests: Remove install and build of backfire and sendme")
+    - install_manpage_rt-migrate-test: Corresponds to upstream commit
+      dff174f994f5 ("rt-tests: Makefile: Add missing install of
+      rt-migrate-test.8 man page")
+    - manpage_pip_stress: Upstream provides a manpage since commit
+      c2cf910af821 ("rt-tests: pip_stress: Add an initial man page for
+      pip_stress")
+    Refresh remaining patches.
 
  -- Uwe Kleine-König <ukleinek@debian.org>  Fri, 21 Jun 2019 21:08:18 +0200
 
diff --git a/debian/patches/debian_has_recent_glibc.patch b/debian/patches/debian_has_recent_glibc.patch
index 42815c7..82ec224 100644
--- a/debian/patches/debian_has_recent_glibc.patch
+++ b/debian/patches/debian_has_recent_glibc.patch
@@ -16,7 +16,7 @@ Forwarded: not-needed
 
 --- a/Makefile
 +++ b/Makefile
-@@ -19,7 +19,6 @@
+@@ -22,7 +22,6 @@
  TARGETS = $(sources:.c=)
  LIBS	= -lrt -lpthread
  RTTESTLIB = -lrttest -L$(OBJDIR)
@@ -24,9 +24,9 @@ Forwarded: not-needed
  DESTDIR	?=
  prefix  ?= /usr/local
  bindir  ?= $(prefix)/bin
-@@ -136,7 +135,7 @@
- hackbench: $(OBJDIR)/hackbench.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS)
+@@ -150,7 +149,7 @@
+ ssdd: $(OBJDIR)/ssdd.o $(OBJDIR)/librttest.a
+ 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
  
 -LIBOBJS =$(addprefix $(OBJDIR)/,error.o rt-get_cpu.o rt-sched.o rt-utils.o)
 +LIBOBJS =$(addprefix $(OBJDIR)/,error.o rt-sched.o rt-utils.o)
diff --git a/debian/patches/dont-build-backfire.patch b/debian/patches/dont-build-backfire.patch
deleted file mode 100644
index e2aa2f1..0000000
--- a/debian/patches/dont-build-backfire.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -11,7 +11,6 @@
- 	  pmqtest.c \
- 	  ptsematest.c \
- 	  rt-migrate-test.c \
--	  sendme.c \
- 	  signaltest.c \
- 	  sigwaittest.c \
- 	  svsematest.c
-@@ -78,7 +77,6 @@
- VPATH	+= src/sigwaittest:
- VPATH	+= src/svsematest:
- VPATH	+= src/pmqtest:
--VPATH	+= src/backfire:
- VPATH	+= src/lib:
- VPATH	+= src/hackbench:
- 
-@@ -126,9 +124,6 @@
- pmqtest: $(OBJDIR)/pmqtest.o $(OBJDIR)/librttest.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS)
- 
--sendme: $(OBJDIR)/sendme.o $(OBJDIR)/librttest.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) $(EXTRA_LIBS)
--
- pip_stress: $(OBJDIR)/pip_stress.o $(OBJDIR)/librttest.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
- 
-@@ -164,9 +159,6 @@
- 	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
- 	mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
- 	cp $(TARGETS) "$(DESTDIR)$(bindir)"
--	install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c"
--	install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile"
--	gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
- 	gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
- 	gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
- 	gzip -c src/pi_tests/pip_stress.8 >"$(DESTDIR)$(mandir)/man8/pip_stress.8.gz"
-@@ -175,7 +167,6 @@
- 	gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
- 	gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
- 	gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
--	gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz"
- 	gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz"
- 	gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz"
- 
diff --git a/debian/patches/fix_comment_about_realtime_group.patch b/debian/patches/fix_comment_about_realtime_group.patch
index d27b551..ff02f7c 100644
--- a/debian/patches/fix_comment_about_realtime_group.patch
+++ b/debian/patches/fix_comment_about_realtime_group.patch
@@ -14,7 +14,7 @@ Closes: http://bugs.debian.org/619938
 
 --- a/src/lib/rt-utils.c
 +++ b/src/lib/rt-utils.c
-@@ -270,7 +270,8 @@
+@@ -271,7 +271,8 @@
  	param.sched_priority = 1;
  	if (sched_setscheduler(0, SCHED_FIFO, &param)) {
  		fprintf(stderr, "Unable to change scheduling policy!\n");
diff --git a/debian/patches/install_hwlatdetect_into_sbindir.patch b/debian/patches/install_hwlatdetect_into_sbindir.patch
index 49d8e89..5e64257 100644
--- a/debian/patches/install_hwlatdetect_into_sbindir.patch
+++ b/debian/patches/install_hwlatdetect_into_sbindir.patch
@@ -7,9 +7,11 @@ needs root privileges install it into $sbindir.
  Makefile |    9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
---- a/Makefile
-+++ b/Makefile
-@@ -23,6 +23,7 @@
+Index: rt-tests/Makefile
+===================================================================
+--- rt-tests.orig/Makefile
++++ rt-tests/Makefile
+@@ -26,6 +26,7 @@ EXTRA_LIBS ?= -ldl	# for get_cpu
  DESTDIR	?=
  prefix  ?= /usr/local
  bindir  ?= $(prefix)/bin
@@ -17,16 +19,16 @@ needs root privileges install it into $sbindir.
  mandir	?= $(prefix)/share/man
  srcdir	?= $(prefix)/src
  
-@@ -30,8 +31,6 @@
+@@ -33,8 +34,6 @@ CFLAGS ?= -Wall -Wno-nonnull
  CPPFLAGS += -D_GNU_SOURCE -Isrc/include
  LDFLAGS ?=
  
--PYLIB  ?= $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
+-PYLIB  ?= $(shell python3 -c 'import distutils.sysconfig;  print (distutils.sysconfig.get_python_lib())')
 -
  ifndef DEBUG
- 	CFLAGS	+= -O2
+ 	CFLAGS	+= -O2 -g
  else
-@@ -181,13 +180,9 @@
+@@ -198,13 +197,9 @@ install: all install_hwlatdetect
  
  .PHONY: install_hwlatdetect
  install_hwlatdetect: hwlatdetect
diff --git a/debian/patches/install_manpage_rt-migrate-test.patch b/debian/patches/install_manpage_rt-migrate-test.patch
deleted file mode 100644
index ce4138a..0000000
--- a/debian/patches/install_manpage_rt-migrate-test.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: John Kacur <jkacur@redhat.com>
-Subject: rt-tests: Makefile: Add missing install of rt-migrate-test.8 man page
-
-Add missing install of rt-migrate-test.8 man page
-
-Signed-off-by: John Kacur <jkacur@redhat.com>
-Origin: Upstream, commit:dff174f994f547a5785d32454865f140daacb0f5
----
---- a/Makefile
-+++ b/Makefile
-@@ -171,6 +171,7 @@
- 	gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
- 	gzip -c src/pi_tests/pip_stress.8 >"$(DESTDIR)$(mandir)/man8/pip_stress.8.gz"
- 	gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
-+	gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz"
- 	gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
- 	gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
- 	gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz"
diff --git a/debian/patches/manpage_pip_stress.patch b/debian/patches/manpage_pip_stress.patch
deleted file mode 100644
index 148b035..0000000
--- a/debian/patches/manpage_pip_stress.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-Subject: man page for pip_stress
-
-The Debian package checker lintian criticizes that pip_stress doesn't have a
-man page. So put a short version of the description from the source file
-into a man page to make lintian happy.
----
- Makefile                  |    1 +
- src/pi_tests/pip_stress.8 |   25 +++++++++++++++++++++++++
- 2 files changed, 26 insertions(+)
-
---- /dev/null
-+++ b/src/pi_tests/pip_stress.8
-@@ -0,0 +1,25 @@
-+.TH pip_stress 8 2011-06-24
-+.SH NAME
-+pip_stress \- test priority inheritance between processes
-+.SH SYNOPSIS
-+.B pip_stress
-+.SH DESCRIPTION
-+.B pip_stress
-+creates a priority inversion using three processes and a priority inheritance
-+mutex shared via shared memory.
-+All three processes are bound to run on the same cpu.
-+The process with the lowest priority holds a mutex and is prempted by the
-+medium priority process that just runs an infinite loop.
-+The third process with the highest priority tries to grab the mutex that is
-+hold by the low prio process.
-+As a priority inheritance mutex is used the low priority process lends the high
-+priority process' priority to unlock the mutex and so stops the medium priority
-+process blocking the high priority one.
-+
-+.B pip_stress
-+doesn't take any options and quits as soon as the priority inversion is
-+resolved which should happen instantly.
-+
-+.SH AUTHOR
-+.B pip_stress
-+was written by John Kacur <jkacur@redhat.com>.
---- a/Makefile
-+++ b/Makefile
-@@ -170,6 +170,7 @@
- 	gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz"
- 	gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz"
- 	gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz"
-+	gzip -c src/pi_tests/pip_stress.8 >"$(DESTDIR)$(mandir)/man8/pip_stress.8.gz"
- 	gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz"
- 	gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz"
- 	gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz"
diff --git a/debian/patches/series b/debian/patches/series
index 85dcc9b..560ff17 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
 install_hwlatdetect_into_sbindir.patch
 debian_adapt_errormsg_on_failure_to_open_device.patch
-manpage_pip_stress.patch
 debian_has_recent_glibc.patch
 fix_comment_about_realtime_group.patch
-install_manpage_rt-migrate-test.patch
-dont-build-backfire.patch