[ptxdist] [PATCH] rt-tests: Bump to version 0.85

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

All patches but the hackbench fix can be dropped because the
corresponding issues are fixed upstream.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 patches/rt-tests-0.73/add-extra-cflags.patch       | 32 -----------
 patches/rt-tests-0.73/fix_3_0_issue.diff           | 62 ----------------------
 ...bench-init-child-s-struct-before-using-it.patch | 57 --------------------
 patches/rt-tests-0.73/series                       |  3 --
 ...bench-init-child-s-struct-before-using-it.patch | 57 ++++++++++++++++++++
 patches/rt-tests-0.85/series                       |  1 +
 rules/rt-tests.make                                |  6 +--
 7 files changed, 61 insertions(+), 157 deletions(-)
 delete mode 100644 patches/rt-tests-0.73/add-extra-cflags.patch
 delete mode 100644 patches/rt-tests-0.73/fix_3_0_issue.diff
 delete mode 100644 patches/rt-tests-0.73/hackbench-init-child-s-struct-before-using-it.patch
 delete mode 100644 patches/rt-tests-0.73/series
 create mode 100644 patches/rt-tests-0.85/hackbench-init-child-s-struct-before-using-it.patch
 create mode 100644 patches/rt-tests-0.85/series

diff --git a/patches/rt-tests-0.73/add-extra-cflags.patch b/patches/rt-tests-0.73/add-extra-cflags.patch
deleted file mode 100644
index fc869c6..0000000
--- a/patches/rt-tests-0.73/add-extra-cflags.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CFLAGS are specified in environment as well
-
-If the environment already has specified CFLAGS we shall
-not overwrite them
-
-Signed-off-by: Remy Bohmer <linux@bohmer.net>
----
- Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: rt-tests-0.73/Makefile
-===================================================================
---- rt-tests-0.73.orig/Makefile
-+++ rt-tests-0.73/Makefile
-@@ -6,7 +6,7 @@ sources = cyclictest.c signaltest.c pi_s
- 
- TARGETS = $(sources:.c=)
- 
--LIBS 	= -lrt -lpthread
-+LIBS	= $(LDFLAGS) -lrt -lpthread
- EXTRA_LIBS ?= -ldl	# for get_cpu
- DESTDIR	?=
- prefix  ?= /usr/local
-@@ -14,7 +14,7 @@ bindir  ?= $(prefix)/bin
- mandir	?= $(prefix)/share/man
- srcdir	?= $(prefix)/src
- 
--CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-+CFLAGS := $(CPPFLAGS) -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include $(CFLAGS)
- 
- PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
- 
diff --git a/patches/rt-tests-0.73/fix_3_0_issue.diff b/patches/rt-tests-0.73/fix_3_0_issue.diff
deleted file mode 100644
index a6558b8..0000000
--- a/patches/rt-tests-0.73/fix_3_0_issue.diff
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Juergen Beisert <jbe@pengutronix.de>
-Subject: Fix a small Linux-3.x issue
-
-Without this patch cyclictest states:
-
-"Most functions require kernel 2.6"
-
-Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
-
----
- src/cyclictest/cyclictest.c |   38 ++++++++++++++++++++++----------------
- 1 file changed, 22 insertions(+), 16 deletions(-)
-
-Index: rt-tests-0.73/src/cyclictest/cyclictest.c
-===================================================================
---- rt-tests-0.73.orig/src/cyclictest/cyclictest.c
-+++ rt-tests-0.73/src/cyclictest/cyclictest.c
-@@ -1104,22 +1104,28 @@ static int check_kernel(void)
- 		return KV_NOT_26;
- 	}
- 	sscanf(kname.release, "%d.%d.%d", &maj, &min, &sub);
--	if (maj == 2 && min == 6) {
--		if (sub < 18)
--			kv = KV_26_LT18;
--		else if (sub < 24)
--			kv = KV_26_LT24;
--		else if (sub < 28) {
--			kv = KV_26_CURR;
--			strcpy(functiontracer, "ftrace");
--			strcpy(traceroptions, "iter_ctrl");
--		} else {
--			kv = KV_26_CURR;
--			strcpy(functiontracer, "function");
--			strcpy(traceroptions, "trace_options");
--		}
--	} else
--		kv = KV_NOT_26;
-+	if (maj == 3) {
-+		kv = KV_26_CURR;
-+		strcpy(functiontracer, "function");
-+		strcpy(traceroptions, "trace_options");
-+	} else {
-+		if (maj == 2 && min == 6) {
-+			if (sub < 18)
-+				kv = KV_26_LT18;
-+			else if (sub < 24)
-+				kv = KV_26_LT24;
-+			else if (sub < 28) {
-+				kv = KV_26_CURR;
-+				strcpy(functiontracer, "ftrace");
-+				strcpy(traceroptions, "iter_ctrl");
-+			} else {
-+				kv = KV_26_CURR;
-+				strcpy(functiontracer, "function");
-+				strcpy(traceroptions, "trace_options");
-+			}
-+		} else
-+			kv = KV_NOT_26;
-+	}
- 
- 	return kv;
- }
diff --git a/patches/rt-tests-0.73/hackbench-init-child-s-struct-before-using-it.patch b/patches/rt-tests-0.73/hackbench-init-child-s-struct-before-using-it.patch
deleted file mode 100644
index aaa90df..0000000
--- a/patches/rt-tests-0.73/hackbench-init-child-s-struct-before-using-it.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Thu, 11 Apr 2013 15:20:05 +0200
-Subject: [PATCH] hackbench: init child's struct before using it
-
-Commit ad27df7 ("Reimplement better child tracking and improve error
-handling") changed the way of reporting pid/error after creating a
-child. It will return an union which is a mix pid_t, pthread_t and a
-signed long long for errors.
-Now on 32bit x86 both pid_t and pthread_t are four byte in size and are
-stored in the first 4 bytes. Now if the most significant bit of the long
-long variable happens to be set by chance (because nobody really
-initializes the variable here) then error variable will be negative. On
-little endian machines the assignment of pid or threadid won't reset the
-sign bit and you see this:
-
-| Running in process mode with 10 groups using 40 file descriptors each (== 400 tasks)
-| Each sender will pass 100 messages of 100 bytes
-| 0 children started.  Expected 40
-| sending SIGTERM to all child processes
-| signaling 0 worker threads to terminate
-| Creating workers (error: Success)
-
-A machine with proper endian handlig (that is big endian) would reset
-the sign bit during the assignment of pid and I would not have to make
-this patch :)
-
-While here, I make create_worker() since it is not used outside of this
-file.
-
-Cc: David Sommerseth <davids@redhat.com>
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Signed-off-by: Clark Williams <clark.williams@gmail.com>
-Origin: upstream, commit:dd6ae1155dc7fbee79426ae5952d48b4151c1cd7
----
- src/hackbench/hackbench.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
-index 03b74b0..6a7f8a3 100644
---- a/src/hackbench/hackbench.c
-+++ b/src/hackbench/hackbench.c
-@@ -184,13 +184,14 @@ again:
- 	return NULL;
- }
- 
--childinfo_t create_worker(void *ctx, void *(*func)(void *))
-+static childinfo_t create_worker(void *ctx, void *(*func)(void *))
- {
- 	pthread_attr_t attr;
- 	int err;
- 	childinfo_t child;
- 	pid_t childpid;
- 
-+	memset(&child, 0, sizeof(child));
- 	switch (process_mode) {
- 	case 1: /* process mode */
- 		/* Fork the sender/receiver child. */
diff --git a/patches/rt-tests-0.73/series b/patches/rt-tests-0.73/series
deleted file mode 100644
index 8bf10ce..0000000
--- a/patches/rt-tests-0.73/series
+++ /dev/null
@@ -1,3 +0,0 @@
-fix_3_0_issue.diff
-add-extra-cflags.patch
-hackbench-init-child-s-struct-before-using-it.patch
diff --git a/patches/rt-tests-0.85/hackbench-init-child-s-struct-before-using-it.patch b/patches/rt-tests-0.85/hackbench-init-child-s-struct-before-using-it.patch
new file mode 100644
index 0000000..bce17e1
--- /dev/null
+++ b/patches/rt-tests-0.85/hackbench-init-child-s-struct-before-using-it.patch
@@ -0,0 +1,57 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 11 Apr 2013 17:20:05 +0200
+Subject: [PATCH] hackbench: init child's struct before using it
+
+Commit ad27df7 ("Reimplement better child tracking and improve error
+handling") changed the way of reporting pid/error after creating a
+child. It will return an union which is a mix pid_t, pthread_t and a
+signed long long for errors.
+Now on 32bit x86 both pid_t and pthread_t are four byte in size and are
+stored in the first 4 bytes. Now if the most significant bit of the long
+long variable happens to be set by chance (because nobody really
+initializes the variable here) then error variable will be negative. On
+little endian machines the assignment of pid or threadid won't reset the
+sign bit and you see this:
+
+| Running in process mode with 10 groups using 40 file descriptors each (== 400 tasks)
+| Each sender will pass 100 messages of 100 bytes
+| 0 children started.  Expected 40
+| sending SIGTERM to all child processes
+| signaling 0 worker threads to terminate
+| Creating workers (error: Success)
+
+A machine with proper endian handlig (that is big endian) would reset
+the sign bit during the assignment of pid and I would not have to make
+this patch :)
+
+While here, I make create_worker() since it is not used outside of this
+file.
+
+Cc: David Sommerseth <davids@redhat.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Clark Williams <clark.williams@gmail.com>
+Origin: upstream, commit:dd6ae1155dc7fbee79426ae5952d48b4151c1cd7
+---
+ src/hackbench/hackbench.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/hackbench/hackbench.c b/src/hackbench/hackbench.c
+index 8baeb23..c21b4db 100644
+--- a/src/hackbench/hackbench.c
++++ b/src/hackbench/hackbench.c
+@@ -189,13 +189,14 @@ again:
+ 	return NULL;
+ }
+ 
+-childinfo_t create_worker(void *ctx, void *(*func)(void *))
++static childinfo_t create_worker(void *ctx, void *(*func)(void *))
+ {
+ 	pthread_attr_t attr;
+ 	int err;
+ 	childinfo_t child;
+ 	pid_t childpid;
+ 
++	memset(&child, 0, sizeof(child));
+ 	switch (process_mode) {
+ 	case PROCESS_MODE: /* process mode */
+ 		/* Fork the sender/receiver child. */
diff --git a/patches/rt-tests-0.85/series b/patches/rt-tests-0.85/series
new file mode 100644
index 0000000..51dae0e
--- /dev/null
+++ b/patches/rt-tests-0.85/series
@@ -0,0 +1 @@
+hackbench-init-child-s-struct-before-using-it.patch
diff --git a/rules/rt-tests.make b/rules/rt-tests.make
index 1880beb..fb4de22 100644
--- a/rules/rt-tests.make
+++ b/rules/rt-tests.make
@@ -19,11 +19,11 @@ PACKAGES-$(PTXCONF_RT_TESTS) += rt-tests
 #
 # Paths and names
 #
-RT_TESTS_VERSION	:= 0.73
-RT_TESTS_MD5		:= 98da46135f0a91c96cb7e5b27c7e3bb6
+RT_TESTS_VERSION	:= 0.85
+RT_TESTS_MD5		:= bdc9b41ee6b78bfc5d59edc0bdbfd596
 RT_TESTS_LICENSE	:= GPLv2, GPLv2+
 RT_TESTS		:= rt-tests-$(RT_TESTS_VERSION)
-RT_TESTS_SUFFIX		:= tar.bz2
+RT_TESTS_SUFFIX		:= tar.gz
 RT_TESTS_URL		:= $(call ptx/mirror, KERNEL, kernel/people/clrkwllms/rt-tests/$(RT_TESTS).$(RT_TESTS_SUFFIX))
 RT_TESTS_SOURCE		:= $(SRCDIR)/$(RT_TESTS).$(RT_TESTS_SUFFIX)
 RT_TESTS_DIR		:= $(BUILDDIR)/$(RT_TESTS)
-- 
1.8.3.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de