[debian] new patches applied upstream to fix typos and empty directories

This requires a patch refresh.

6 files changed, 84 insertions, 12 deletions

diff --git a/debian/patches/Makefile-don-t-create-empty-directories-in-install-t.patch b/debian/patches/Makefile-don-t-create-empty-directories-in-install-t.patch
new file mode 100644
index 0000000..3120d0b
--- /dev/null
+++ b/debian/patches/Makefile-don-t-create-empty-directories-in-install-t.patch
@@ -0,0 +1,40 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <ukleinek@debian.org>
+Date: Sun, 17 Nov 2019 22:44:05 +0100
+Subject: [PATCH rt-tests] Makefile: don't create empty directories in install
+ target
+
+Both $(prefix)/src and $(prefix)/share/man/man4 are unused since commit
+2829763fdd79 ("rt-tests: Remove install and build of backfire and
+sendme")
+
+Signed-off-by: John Kacur <jkacur@redhat.com>
+Origin: upstream, commit:e782ceaafce358c0067eb6405c3412d5e899d4fc
+---
+ Makefile | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b57340874213..6eee3d8f7845 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,6 @@ DESTDIR	?=
+ prefix  ?= /usr/local
+ bindir  ?= $(prefix)/bin
+ mandir	?= $(prefix)/share/man
+-srcdir	?= $(prefix)/src
+ 
+ CFLAGS ?= -Wall -Wno-nonnull
+ CPPFLAGS += -D_GNU_SOURCE -Isrc/include
+@@ -177,8 +176,7 @@ rebuild:
+ 
+ .PHONY: install
+ install: all install_hwlatdetect
+-	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
+-	mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
++	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8"
+ 	cp $(TARGETS) "$(DESTDIR)$(bindir)"
+ 	install src/queuelat/get_cpuinfo_mhz.sh "$(DESTDIR)$(bindir)"
+ 	install src/queuelat/determine_maximum_mpps.sh "${DESTDIR}${bindir}"
+-- 
+2.24.0
+
diff --git a/debian/patches/cyclictest-fix-typos.patch b/debian/patches/cyclictest-fix-typos.patch
new file mode 100644
index 0000000..8ebb33c
--- /dev/null
+++ b/debian/patches/cyclictest-fix-typos.patch
@@ -0,0 +1,33 @@
+From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= <ukleinek@debian.org>
+Date: Sun, 17 Nov 2019 22:40:38 +0100
+Subject: [PATCH rt-tests] cyclictest: fix typos
+
+The called function is called clock_gettime with "only" two t as can be
+seen tree lines above. Also there was a wrong r in useful.
+
+Signed-off-by: John Kacur <jkacur@redhat.com>
+Origin: upstream, commit:ab2ea3fd06df5361e3ae0bb00366c30f30073fb0
+---
+ src/cyclictest/cyclictest.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/cyclictest/cyclictest.c
++++ b/src/cyclictest/cyclictest.c
+@@ -798,7 +798,7 @@
+ 		ret = clock_gettime(par->clock, &now);
+ 		if (ret != 0) {
+ 			if (ret != EINTR)
+-				warn("clock_getttime() failed. errno: %d\n",
++				warn("clock_gettime() failed. errno: %d\n",
+ 				     errno);
+ 			goto out;
+ 		}
+@@ -960,7 +960,7 @@
+ 	       "			   but will not drain your battery so quickly\n"
+ 	       "-m       --mlockall        lock current and future memory allocations\n"
+ 	       "-M       --refresh_on_max  delay updating the screen until a new max\n"
+-	       "			   latency is hit. Userful for low bandwidth.\n"
++	       "			   latency is hit. Useful for low bandwidth.\n"
+ 	       "-N       --nsecs           print results in ns instead of us (default us)\n"
+ 	       "-o RED   --oscope=RED      oscilloscope mode, reduce verbose output by RED\n"
+ 	       "-p PRIO  --priority=PRIO   priority of highest prio thread\n"
diff --git a/debian/patches/debian_has_recent_glibc.patch b/debian/patches/debian_has_recent_glibc.patch
index 82ec224..9a4190f 100644
--- a/debian/patches/debian_has_recent_glibc.patch
+++ b/debian/patches/debian_has_recent_glibc.patch
@@ -24,7 +24,7 @@ Forwarded: not-needed
  DESTDIR	?=
  prefix  ?= /usr/local
  bindir  ?= $(prefix)/bin
-@@ -150,7 +149,7 @@
+@@ -149,7 +148,7 @@
  ssdd: $(OBJDIR)/ssdd.o $(OBJDIR)/librttest.a
  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB)
  
diff --git a/debian/patches/drop-sh-extension.patch b/debian/patches/drop-sh-extension.patch
index 32a21f0..72703c5 100644
--- a/debian/patches/drop-sh-extension.patch
+++ b/debian/patches/drop-sh-extension.patch
@@ -7,9 +7,9 @@ W: rt-tests: script-with-language-extension usr/bin/get_cpuinfo_mhz.sh
 
 --- a/Makefile
 +++ b/Makefile
-@@ -178,8 +178,8 @@
- 	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4"
- 	mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8"
+@@ -176,8 +176,8 @@
+ install: all install_hwlatdetect
+ 	mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8"
  	cp $(TARGETS) "$(DESTDIR)$(bindir)"
 -	install src/queuelat/get_cpuinfo_mhz.sh "$(DESTDIR)$(bindir)"
 -	install src/queuelat/determine_maximum_mpps.sh "${DESTDIR}${bindir}"
diff --git a/debian/patches/install_hwlatdetect_into_sbindir.patch b/debian/patches/install_hwlatdetect_into_sbindir.patch
index 5e64257..bd60709 100644
--- a/debian/patches/install_hwlatdetect_into_sbindir.patch
+++ b/debian/patches/install_hwlatdetect_into_sbindir.patch
@@ -7,19 +7,16 @@ needs root privileges install it into $sbindir.
  Makefile |    9 ++-------
  1 file changed, 2 insertions(+), 7 deletions(-)
 
-Index: rt-tests/Makefile
-===================================================================
---- rt-tests.orig/Makefile
-+++ rt-tests/Makefile
-@@ -26,6 +26,7 @@ EXTRA_LIBS ?= -ldl	# for get_cpu
+--- a/Makefile
++++ b/Makefile
+@@ -26,14 +26,13 @@
  DESTDIR	?=
  prefix  ?= /usr/local
  bindir  ?= $(prefix)/bin
 +sbindir ?= $(prefix)/sbin
  mandir	?= $(prefix)/share/man
- srcdir	?= $(prefix)/src
  
-@@ -33,8 +34,6 @@ CFLAGS ?= -Wall -Wno-nonnull
+ CFLAGS ?= -Wall -Wno-nonnull
  CPPFLAGS += -D_GNU_SOURCE -Isrc/include
  LDFLAGS ?=
  
@@ -28,7 +25,7 @@ Index: rt-tests/Makefile
  ifndef DEBUG
  	CFLAGS	+= -O2 -g
  else
-@@ -198,13 +197,9 @@ install: all install_hwlatdetect
+@@ -196,13 +195,9 @@
  
  .PHONY: install_hwlatdetect
  install_hwlatdetect: hwlatdetect
diff --git a/debian/patches/series b/debian/patches/series
index 156e913..a8d0e45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
+cyclictest-fix-typos.patch
+Makefile-don-t-create-empty-directories-in-install-t.patch
 install_hwlatdetect_into_sbindir.patch
 debian_adapt_errormsg_on_failure_to_open_device.patch
 debian_has_recent_glibc.patch