* [Buildroot] [PATCH 1/4] rt-tests: rename patch to the new convention
2014-11-10 9:59 [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Alexey Brodkin
@ 2014-11-10 9:59 ` Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 2/4] rt-tests: switch site from Debian snapshot to Linux's git Alexey Brodkin
` (3 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-10 9:59 UTC (permalink / raw)
To: buildroot
As a preparation to the introduction of an additional patch to rt-tests,
let's rename the existing patch to the new naming convention.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/rt-tests/01-fix-build-system.patch | 43 ++++++++++
package/rt-tests/02-uclibc.patch | 103 +++++++++++++++++++++++
package/rt-tests/rt-tests-fix-build-system.patch | 43 ----------
package/rt-tests/rt-tests-uclibc.patch | 103 -----------------------
4 files changed, 146 insertions(+), 146 deletions(-)
create mode 100644 package/rt-tests/01-fix-build-system.patch
create mode 100644 package/rt-tests/02-uclibc.patch
delete mode 100644 package/rt-tests/rt-tests-fix-build-system.patch
delete mode 100644 package/rt-tests/rt-tests-uclibc.patch
diff --git a/package/rt-tests/01-fix-build-system.patch b/package/rt-tests/01-fix-build-system.patch
new file mode 100644
index 0000000..9d6aa05
--- /dev/null
+++ b/package/rt-tests/01-fix-build-system.patch
@@ -0,0 +1,43 @@
+Fix various minor issues with rt-tests build system
+
+The issues fixed are :
+
+ * Remove the automatic NUMA detection from the host
+ architecture. This is broken when doing cross-compilation. One can
+ still set NUMA=1 if NUMA support is desired.
+
+ * Expand the CFLAGS provided through the environment instead of
+ overriding it.
+
+ * Provide a HASPYTHON variable to tell whether the target system has
+ Python or not. Otherwise, the build system simply tests whether
+ Python is available on the host. The PYLIB variable is also changed
+ so that it can be overriden from the environment, in order to
+ provide the correct Python module location for the target.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: rt-tests/Makefile
+===================================================================
+--- rt-tests.orig/Makefile
++++ rt-tests/Makefile
+@@ -14,15 +14,11 @@
+ mandir ?= $(prefix)/share/man
+ srcdir ?= $(prefix)/src
+
+-machinetype = $(shell uname -m | \
+- sed -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
+-ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
+-NUMA := 1
+-endif
+-
+-CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
++override CFLAGS += -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
+
+-PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
++ifeq ($(HASPYTHON),1)
++PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
++endif
+
+ ifndef DEBUG
+ CFLAGS += -O2
diff --git a/package/rt-tests/02-uclibc.patch b/package/rt-tests/02-uclibc.patch
new file mode 100644
index 0000000..b8e1ac5
--- /dev/null
+++ b/package/rt-tests/02-uclibc.patch
@@ -0,0 +1,103 @@
+[PATCH] fix build with uClibc
+
+Fix two build issues with (modern) uClibc:
+- uClibc has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME,
+ conflicting with emulation function
+- uClibc doesn't provide utmpx.h if not built with UCLIBC_HAS_UTMPX, which
+ is included in several files (but not needed).
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/backfire/sendme.c | 1 -
+ src/cyclictest/cyclictest.c | 3 ++-
+ src/pmqtest/pmqtest.c | 1 -
+ src/ptsematest/ptsematest.c | 1 -
+ src/sigwaittest/sigwaittest.c | 2 --
+ src/svsematest/svsematest.c | 1 -
+ 6 files changed, 2 insertions(+), 7 deletions(-)
+
+Index: rt-tests-0.83/src/backfire/sendme.c
+===================================================================
+--- rt-tests-0.83.orig/src/backfire/sendme.c
++++ rt-tests-0.83/src/backfire/sendme.c
+@@ -32,7 +32,6 @@
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+
+-#include <utmpx.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+Index: rt-tests-0.83/src/cyclictest/cyclictest.c
+===================================================================
+--- rt-tests-0.83.orig/src/cyclictest/cyclictest.c
++++ rt-tests-0.83/src/cyclictest/cyclictest.c
+@@ -23,6 +23,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <errno.h>
++#include <features.h>
+ #include <limits.h>
+ #include <linux/unistd.h>
+
+@@ -53,7 +54,7 @@
+ #define gettid() syscall(__NR_gettid)
+ #define sigev_notify_thread_id _sigev_un._tid
+
+-#ifdef __UCLIBC__
++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__)
+ #define MAKE_PROCESS_CPUCLOCK(pid, clock) \
+ ((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
+ #define CPUCLOCK_SCHED 2
+Index: rt-tests-0.83/src/pmqtest/pmqtest.c
+===================================================================
+--- rt-tests-0.83.orig/src/pmqtest/pmqtest.c
++++ rt-tests-0.83/src/pmqtest/pmqtest.c
+@@ -33,7 +33,6 @@
+ #include <sys/time.h>
+ #include <sys/mman.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include <mqueue.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+Index: rt-tests-0.83/src/ptsematest/ptsematest.c
+===================================================================
+--- rt-tests-0.83.orig/src/ptsematest/ptsematest.c
++++ rt-tests-0.83/src/ptsematest/ptsematest.c
+@@ -33,7 +33,6 @@
+ #include <sys/time.h>
+ #include <sys/mman.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+
+Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
+===================================================================
+--- rt-tests-0.83.orig/src/sigwaittest/sigwaittest.c
++++ rt-tests-0.83/src/sigwaittest/sigwaittest.c
+@@ -31,11 +31,9 @@
+ #include <signal.h>
+ #include <string.h>
+ #include <time.h>
+-#include <utmpx.h>
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <linux/unistd.h>
+-#include <utmpx.h>
+ #include "rt-utils.h"
+ #include "rt-get_cpu.h"
+
+Index: rt-tests-0.83/src/svsematest/svsematest.c
+===================================================================
+--- rt-tests-0.83.orig/src/svsematest/svsematest.c
++++ rt-tests-0.83/src/svsematest/svsematest.c
+@@ -31,7 +31,6 @@
+ #include <sched.h>
+ #include <string.h>
+ #include <time.h>
+-#include <utmpx.h>
+
+ #include <linux/unistd.h>
+
diff --git a/package/rt-tests/rt-tests-fix-build-system.patch b/package/rt-tests/rt-tests-fix-build-system.patch
deleted file mode 100644
index 9d6aa05..0000000
--- a/package/rt-tests/rt-tests-fix-build-system.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Fix various minor issues with rt-tests build system
-
-The issues fixed are :
-
- * Remove the automatic NUMA detection from the host
- architecture. This is broken when doing cross-compilation. One can
- still set NUMA=1 if NUMA support is desired.
-
- * Expand the CFLAGS provided through the environment instead of
- overriding it.
-
- * Provide a HASPYTHON variable to tell whether the target system has
- Python or not. Otherwise, the build system simply tests whether
- Python is available on the host. The PYLIB variable is also changed
- so that it can be overriden from the environment, in order to
- provide the correct Python module location for the target.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: rt-tests/Makefile
-===================================================================
---- rt-tests.orig/Makefile
-+++ rt-tests/Makefile
-@@ -14,15 +14,11 @@
- mandir ?= $(prefix)/share/man
- srcdir ?= $(prefix)/src
-
--machinetype = $(shell uname -m | \
-- sed -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
--ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
--NUMA := 1
--endif
--
--CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-+override CFLAGS += -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-
--PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
-+ifeq ($(HASPYTHON),1)
-+PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
-+endif
-
- ifndef DEBUG
- CFLAGS += -O2
diff --git a/package/rt-tests/rt-tests-uclibc.patch b/package/rt-tests/rt-tests-uclibc.patch
deleted file mode 100644
index b8e1ac5..0000000
--- a/package/rt-tests/rt-tests-uclibc.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-[PATCH] fix build with uClibc
-
-Fix two build issues with (modern) uClibc:
-- uClibc has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME,
- conflicting with emulation function
-- uClibc doesn't provide utmpx.h if not built with UCLIBC_HAS_UTMPX, which
- is included in several files (but not needed).
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- src/backfire/sendme.c | 1 -
- src/cyclictest/cyclictest.c | 3 ++-
- src/pmqtest/pmqtest.c | 1 -
- src/ptsematest/ptsematest.c | 1 -
- src/sigwaittest/sigwaittest.c | 2 --
- src/svsematest/svsematest.c | 1 -
- 6 files changed, 2 insertions(+), 7 deletions(-)
-
-Index: rt-tests-0.83/src/backfire/sendme.c
-===================================================================
---- rt-tests-0.83.orig/src/backfire/sendme.c
-+++ rt-tests-0.83/src/backfire/sendme.c
-@@ -32,7 +32,6 @@
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
-
--#include <utmpx.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/time.h>
-Index: rt-tests-0.83/src/cyclictest/cyclictest.c
-===================================================================
---- rt-tests-0.83.orig/src/cyclictest/cyclictest.c
-+++ rt-tests-0.83/src/cyclictest/cyclictest.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <time.h>
- #include <errno.h>
-+#include <features.h>
- #include <limits.h>
- #include <linux/unistd.h>
-
-@@ -53,7 +54,7 @@
- #define gettid() syscall(__NR_gettid)
- #define sigev_notify_thread_id _sigev_un._tid
-
--#ifdef __UCLIBC__
-+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__)
- #define MAKE_PROCESS_CPUCLOCK(pid, clock) \
- ((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
- #define CPUCLOCK_SCHED 2
-Index: rt-tests-0.83/src/pmqtest/pmqtest.c
-===================================================================
---- rt-tests-0.83.orig/src/pmqtest/pmqtest.c
-+++ rt-tests-0.83/src/pmqtest/pmqtest.c
-@@ -33,7 +33,6 @@
- #include <sys/time.h>
- #include <sys/mman.h>
- #include <linux/unistd.h>
--#include <utmpx.h>
- #include <mqueue.h>
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
-Index: rt-tests-0.83/src/ptsematest/ptsematest.c
-===================================================================
---- rt-tests-0.83.orig/src/ptsematest/ptsematest.c
-+++ rt-tests-0.83/src/ptsematest/ptsematest.c
-@@ -33,7 +33,6 @@
- #include <sys/time.h>
- #include <sys/mman.h>
- #include <linux/unistd.h>
--#include <utmpx.h>
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
-
-Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
-===================================================================
---- rt-tests-0.83.orig/src/sigwaittest/sigwaittest.c
-+++ rt-tests-0.83/src/sigwaittest/sigwaittest.c
-@@ -31,11 +31,9 @@
- #include <signal.h>
- #include <string.h>
- #include <time.h>
--#include <utmpx.h>
- #include <sys/types.h>
- #include <sys/time.h>
- #include <linux/unistd.h>
--#include <utmpx.h>
- #include "rt-utils.h"
- #include "rt-get_cpu.h"
-
-Index: rt-tests-0.83/src/svsematest/svsematest.c
-===================================================================
---- rt-tests-0.83.orig/src/svsematest/svsematest.c
-+++ rt-tests-0.83/src/svsematest/svsematest.c
-@@ -31,7 +31,6 @@
- #include <sched.h>
- #include <string.h>
- #include <time.h>
--#include <utmpx.h>
-
- #include <linux/unistd.h>
-
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 2/4] rt-tests: switch site from Debian snapshot to Linux's git
2014-11-10 9:59 [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 1/4] rt-tests: rename patch to the new convention Alexey Brodkin
@ 2014-11-10 9:59 ` Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 3/4] rt-tests: bump version to 0.89 Alexey Brodkin
` (2 subsequent siblings)
4 siblings, 0 replies; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-10 9:59 UTC (permalink / raw)
To: buildroot
Origin of "rt-tests" is:
git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
Switching to this new "origin" simplifies version bumping because there's
no need in updating Debian snapshot folder as it was done already here:
http://git.buildroot.net/buildroot/commit/package/rt-tests?id=da330e508c2d95e898ac52a2aa39426a5f6d0506
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/rt-tests/rt-tests.mk | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 94f4b1e..d372786 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -4,9 +4,8 @@
#
################################################################################
-RT_TESTS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rt-tests
-RT_TESTS_VERSION = 0.83
-RT_TESTS_SOURCE = rt-tests_$(RT_TESTS_VERSION).orig.tar.gz
+RT_TESTS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
+RT_TESTS_VERSION = v0.83
RT_TESTS_LICENSE = GPLv2+
RT_TESTS_LICENSE_FILES = COPYING
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 3/4] rt-tests: bump version to 0.89
2014-11-10 9:59 [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 1/4] rt-tests: rename patch to the new convention Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 2/4] rt-tests: switch site from Debian snapshot to Linux's git Alexey Brodkin
@ 2014-11-10 9:59 ` Alexey Brodkin
2014-11-10 9:59 ` [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains Alexey Brodkin
2014-11-11 14:43 ` [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Thomas Petazzoni
4 siblings, 0 replies; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-10 9:59 UTC (permalink / raw)
To: buildroot
With this change we're moving to the latest version of rt-tests.
Existing patches were updated so they apply on sources without errors and
warnings.
In "01-fix-build-system.patch" CFLAGS substitution was removed because
now external CFLAGS are accepted:
http://git.kernel.org/cgit/linux/kernel/git/clrkwllms/rt-tests.git/commit/?id=dfcef6e557b7980a33aa30b45bde196ed1780eb1
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/rt-tests/01-fix-build-system.patch | 35 +++++++++-----
package/rt-tests/02-uclibc.patch | 76 ++++++++++++++++--------------
package/rt-tests/rt-tests.mk | 2 +-
3 files changed, 64 insertions(+), 49 deletions(-)
diff --git a/package/rt-tests/01-fix-build-system.patch b/package/rt-tests/01-fix-build-system.patch
index 9d6aa05..36af747 100644
--- a/package/rt-tests/01-fix-build-system.patch
+++ b/package/rt-tests/01-fix-build-system.patch
@@ -1,4 +1,7 @@
-Fix various minor issues with rt-tests build system
+From f9a55a87af57780ea8940561d22cd6a90f461416 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Mon, 10 Nov 2014 11:44:55 +0300
+Subject: [PATCH] Fix various minor issues with rt-tests build system
The issues fixed are :
@@ -6,9 +9,6 @@ The issues fixed are :
architecture. This is broken when doing cross-compilation. One can
still set NUMA=1 if NUMA support is desired.
- * Expand the CFLAGS provided through the environment instead of
- overriding it.
-
* Provide a HASPYTHON variable to tell whether the target system has
Python or not. Otherwise, the build system simply tests whether
Python is available on the host. The PYLIB variable is also changed
@@ -16,23 +16,29 @@ The issues fixed are :
provide the correct Python module location for the target.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+Cc: Peter Korsgaard <peter@korsgaard.com>
+---
+ Makefile | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
-Index: rt-tests/Makefile
-===================================================================
---- rt-tests.orig/Makefile
-+++ rt-tests/Makefile
-@@ -14,15 +14,11 @@
+diff --git a/Makefile b/Makefile
+index 318a5c6..645d138 100644
+--- a/Makefile
++++ b/Makefile
+@@ -14,17 +14,13 @@ bindir ?= $(prefix)/bin
mandir ?= $(prefix)/share/man
srcdir ?= $(prefix)/src
--machinetype = $(shell uname -m | \
-- sed -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
+-machinetype = $(shell $(CC) -dumpmachine | \
+- sed -e 's/-.*//' -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/')
-ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
-NUMA := 1
-endif
-
--CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-+override CFLAGS += -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
+ CFLAGS ?= -Wall -Wno-nonnull
+ CPPFLAGS += -D_GNU_SOURCE -Isrc/include
+ LDFLAGS ?=
-PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()')
+ifeq ($(HASPYTHON),1)
@@ -41,3 +47,6 @@ Index: rt-tests/Makefile
ifndef DEBUG
CFLAGS += -O2
+--
+1.9.3
+
diff --git a/package/rt-tests/02-uclibc.patch b/package/rt-tests/02-uclibc.patch
index b8e1ac5..180bdf7 100644
--- a/package/rt-tests/02-uclibc.patch
+++ b/package/rt-tests/02-uclibc.patch
@@ -1,4 +1,7 @@
-[PATCH] fix build with uClibc
+From 713224456f4a3242496af803413f670433f27c74 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Mon, 10 Nov 2014 11:55:27 +0300
+Subject: [PATCH] [PATCH] fix build with uClibc
Fix two build issues with (modern) uClibc:
- uClibc has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME,
@@ -6,20 +9,20 @@ Fix two build issues with (modern) uClibc:
- uClibc doesn't provide utmpx.h if not built with UCLIBC_HAS_UTMPX, which
is included in several files (but not needed).
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
- src/backfire/sendme.c | 1 -
- src/cyclictest/cyclictest.c | 3 ++-
- src/pmqtest/pmqtest.c | 1 -
- src/ptsematest/ptsematest.c | 1 -
- src/sigwaittest/sigwaittest.c | 2 --
- src/svsematest/svsematest.c | 1 -
+ src/backfire/sendme.c | 1 -
+ src/cyclictest/cyclictest.c | 3 ++-
+ src/pmqtest/pmqtest.c | 1 -
+ src/ptsematest/ptsematest.c | 1 -
+ src/sigwaittest/sigwaittest.c | 2 --
+ src/svsematest/svsematest.c | 1 -
6 files changed, 2 insertions(+), 7 deletions(-)
-Index: rt-tests-0.83/src/backfire/sendme.c
-===================================================================
---- rt-tests-0.83.orig/src/backfire/sendme.c
-+++ rt-tests-0.83/src/backfire/sendme.c
+diff --git a/src/backfire/sendme.c b/src/backfire/sendme.c
+index 8c169dd..b959951 100644
+--- a/src/backfire/sendme.c
++++ b/src/backfire/sendme.c
@@ -32,7 +32,6 @@
#include "rt-utils.h"
#include "rt-get_cpu.h"
@@ -28,11 +31,11 @@ Index: rt-tests-0.83/src/backfire/sendme.c
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/time.h>
-Index: rt-tests-0.83/src/cyclictest/cyclictest.c
-===================================================================
---- rt-tests-0.83.orig/src/cyclictest/cyclictest.c
-+++ rt-tests-0.83/src/cyclictest/cyclictest.c
-@@ -23,6 +23,7 @@
+diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c
+index 4547831..343e421 100644
+--- a/src/cyclictest/cyclictest.c
++++ b/src/cyclictest/cyclictest.c
+@@ -25,6 +25,7 @@
#include <string.h>
#include <time.h>
#include <errno.h>
@@ -40,7 +43,7 @@ Index: rt-tests-0.83/src/cyclictest/cyclictest.c
#include <limits.h>
#include <linux/unistd.h>
-@@ -53,7 +54,7 @@
+@@ -56,7 +57,7 @@
#define gettid() syscall(__NR_gettid)
#define sigev_notify_thread_id _sigev_un._tid
@@ -49,10 +52,10 @@ Index: rt-tests-0.83/src/cyclictest/cyclictest.c
#define MAKE_PROCESS_CPUCLOCK(pid, clock) \
((~(clockid_t) (pid) << 3) | (clockid_t) (clock))
#define CPUCLOCK_SCHED 2
-Index: rt-tests-0.83/src/pmqtest/pmqtest.c
-===================================================================
---- rt-tests-0.83.orig/src/pmqtest/pmqtest.c
-+++ rt-tests-0.83/src/pmqtest/pmqtest.c
+diff --git a/src/pmqtest/pmqtest.c b/src/pmqtest/pmqtest.c
+index 336a8eb..2e34afe 100644
+--- a/src/pmqtest/pmqtest.c
++++ b/src/pmqtest/pmqtest.c
@@ -33,7 +33,6 @@
#include <sys/time.h>
#include <sys/mman.h>
@@ -61,10 +64,10 @@ Index: rt-tests-0.83/src/pmqtest/pmqtest.c
#include <mqueue.h>
#include "rt-utils.h"
#include "rt-get_cpu.h"
-Index: rt-tests-0.83/src/ptsematest/ptsematest.c
-===================================================================
---- rt-tests-0.83.orig/src/ptsematest/ptsematest.c
-+++ rt-tests-0.83/src/ptsematest/ptsematest.c
+diff --git a/src/ptsematest/ptsematest.c b/src/ptsematest/ptsematest.c
+index 7558a41..5358a65 100644
+--- a/src/ptsematest/ptsematest.c
++++ b/src/ptsematest/ptsematest.c
@@ -33,7 +33,6 @@
#include <sys/time.h>
#include <sys/mman.h>
@@ -72,11 +75,11 @@ Index: rt-tests-0.83/src/ptsematest/ptsematest.c
-#include <utmpx.h>
#include "rt-utils.h"
#include "rt-get_cpu.h"
-
-Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
-===================================================================
---- rt-tests-0.83.orig/src/sigwaittest/sigwaittest.c
-+++ rt-tests-0.83/src/sigwaittest/sigwaittest.c
+ #include "error.h"
+diff --git a/src/sigwaittest/sigwaittest.c b/src/sigwaittest/sigwaittest.c
+index 428f5ce..85c32a2 100644
+--- a/src/sigwaittest/sigwaittest.c
++++ b/src/sigwaittest/sigwaittest.c
@@ -31,11 +31,9 @@
#include <signal.h>
#include <string.h>
@@ -89,10 +92,10 @@ Index: rt-tests-0.83/src/sigwaittest/sigwaittest.c
#include "rt-utils.h"
#include "rt-get_cpu.h"
-Index: rt-tests-0.83/src/svsematest/svsematest.c
-===================================================================
---- rt-tests-0.83.orig/src/svsematest/svsematest.c
-+++ rt-tests-0.83/src/svsematest/svsematest.c
+diff --git a/src/svsematest/svsematest.c b/src/svsematest/svsematest.c
+index c1128cc..5d02550 100644
+--- a/src/svsematest/svsematest.c
++++ b/src/svsematest/svsematest.c
@@ -31,7 +31,6 @@
#include <sched.h>
#include <string.h>
@@ -101,3 +104,6 @@ Index: rt-tests-0.83/src/svsematest/svsematest.c
#include <linux/unistd.h>
+--
+1.9.3
+
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index d372786..4cd99c0 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -5,7 +5,7 @@
################################################################################
RT_TESTS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git
-RT_TESTS_VERSION = v0.83
+RT_TESTS_VERSION = v0.89
RT_TESTS_LICENSE = GPLv2+
RT_TESTS_LICENSE_FILES = COPYING
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains
2014-11-10 9:59 [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Alexey Brodkin
` (2 preceding siblings ...)
2014-11-10 9:59 ` [Buildroot] [PATCH 3/4] rt-tests: bump version to 0.89 Alexey Brodkin
@ 2014-11-10 9:59 ` Alexey Brodkin
2014-11-10 10:06 ` Thomas Petazzoni
2014-11-11 14:43 ` [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Thomas Petazzoni
4 siblings, 1 reply; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-10 9:59 UTC (permalink / raw)
To: buildroot
Some architectures are still stuck with non-NPTL toolchains.
These are for example ARC, Blackfin, Xtensa etc.
Still rt-tests are very good benchmarks and it would be good to enable use of
at least selected (those that will be built) tests on those architectures.
This change makes it possible to only build subset of tests that don't require
NPTL calls.
Following tests will be built with non-NPTL toolchain:
* signaltest
* ptsematest
* sigwaittest
* svsematest
* sendme
* hackbench
03-fix-non-nptl-buil.patch was submitted upstream:
https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg762958.html
so as soon as it is accepted with the next version bump this patch should be
removed.
Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/rt-tests/03-fix-non-nptl-buil.patch | 55 +++++++++++++++++++++++++++++
package/rt-tests/Config.in | 4 ---
package/rt-tests/rt-tests.mk | 6 ++++
3 files changed, 61 insertions(+), 4 deletions(-)
create mode 100644 package/rt-tests/03-fix-non-nptl-buil.patch
diff --git a/package/rt-tests/03-fix-non-nptl-buil.patch b/package/rt-tests/03-fix-non-nptl-buil.patch
new file mode 100644
index 0000000..5c65018
--- /dev/null
+++ b/package/rt-tests/03-fix-non-nptl-buil.patch
@@ -0,0 +1,55 @@
+From c6920f97be02ca3fba9320b043acd578ce4c62d8 Mon Sep 17 00:00:00 2001
+From: Alexey Brodkin <abrodkin@synopsys.com>
+Date: Mon, 10 Nov 2014 10:00:13 +0300
+Subject: [PATCH] Makefile: allow building selected tests with non-NPTL
+ toolchain
+
+Some architectures are still stuck with non-NPTL toolchains.
+These are for example ARC, Blackfin, Xtensa etc.
+
+Still rt-tests are very good benchmarks and it would be good to enable use of
+at least selected (those that will be built) tests on those architectures.
+
+This change makes it possible to only build subset of tests that don't require
+NPTL calls.
+
+By default behavior is not modified - all tests are built, but if one wants
+to build with non-NPTL toolchain just add "HAVE_NPTL=no" in command line
+or modify "HAVE_NPTL" variable right in Makefile and execute "make".
+
+This patch was submitted upstream:
+https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg762958.html
+so as soon as it is accepted with the next version bump this patch should be
+removed.
+
+Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
+Cc: Vineet Gupta <vgupta@synopsys.com>
+Cc: Clark Williams <clark.williams@gmail.com>
+---
+ Makefile | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 318a5c6..675edf7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,13 @@
+ VERSION_STRING = 0.89
+
+-sources = cyclictest.c signaltest.c pi_stress.c rt-migrate-test.c \
+- ptsematest.c sigwaittest.c svsematest.c pmqtest.c sendme.c \
+- pip_stress.c hackbench.c
++HAVE_NPTL ?= yes
++
++ifeq ($(HAVE_NPTL),yes)
++sources = cyclictest.c pi_stress.c pip_stress.c pmqtest.c rt-migrate-test.c
++endif
++
++sources += signaltest.c ptsematest.c sigwaittest.c svsematest.c sendme.c \
++ hackbench.c
+
+ TARGETS = $(sources:.c=)
+
+--
+1.9.3
+
diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
index 81e5d06..23cc284 100644
--- a/package/rt-tests/Config.in
+++ b/package/rt-tests/Config.in
@@ -1,7 +1,5 @@
config BR2_PACKAGE_RT_TESTS
bool "rt-tests"
- # no _tid field in 'struct sigevent'
- depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
help
Set of utilities for testing the real-time behaviour of a
Linux system.
@@ -26,5 +24,3 @@ comment "rt-tests may not work on MIPS with an external uClibc toolchain"
depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC
depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el
-comment "rt-tests needs a toolchain w/ NPTL"
- depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL
diff --git a/package/rt-tests/rt-tests.mk b/package/rt-tests/rt-tests.mk
index 4cd99c0..1980556 100644
--- a/package/rt-tests/rt-tests.mk
+++ b/package/rt-tests/rt-tests.mk
@@ -13,15 +13,21 @@ ifeq ($(BR2_PACKAGE_PYTHON),y)
RT_TESTS_DEPENDENCIES = python
endif
+ifneq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),y)
+RT_TESTS_HAVE_NPTL=no
+endif
+
define RT_TESTS_BUILD_CMDS
$(MAKE) -C $(@D) \
CC="$(TARGET_CC)" \
+ HAVE_NPTL=$(RT_TESTS_HAVE_NPTL) \
CFLAGS="$(TARGET_CFLAGS)" \
prefix=/usr
endef
define RT_TESTS_INSTALL_TARGET_CMDS
$(MAKE) -C $(@D) \
+ HAVE_NPTL=$(RT_TESTS_HAVE_NPTL) \
DESTDIR="$(TARGET_DIR)" \
prefix=/usr \
$(if $(BR2_PACKAGE_PYTHON),HASPYTHON=1 PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/) \
--
1.9.3
^ permalink raw reply related [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains
2014-11-10 9:59 ` [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains Alexey Brodkin
@ 2014-11-10 10:06 ` Thomas Petazzoni
2014-11-10 10:24 ` Alexey Brodkin
0 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2014-11-10 10:06 UTC (permalink / raw)
To: buildroot
Dear Alexey Brodkin,
On Mon, 10 Nov 2014 12:59:09 +0300, Alexey Brodkin wrote:
> diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
> index 81e5d06..23cc284 100644
> --- a/package/rt-tests/Config.in
> +++ b/package/rt-tests/Config.in
> @@ -1,7 +1,5 @@
> config BR2_PACKAGE_RT_TESTS
> bool "rt-tests"
> - # no _tid field in 'struct sigevent'
> - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
And it doesn't need thread support at all?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains
2014-11-10 10:06 ` Thomas Petazzoni
@ 2014-11-10 10:24 ` Alexey Brodkin
0 siblings, 0 replies; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-10 10:24 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Mon, 2014-11-10 at 11:06 +0100, Thomas Petazzoni wrote:
> Dear Alexey Brodkin,
>
> On Mon, 10 Nov 2014 12:59:09 +0300, Alexey Brodkin wrote:
>
> > diff --git a/package/rt-tests/Config.in b/package/rt-tests/Config.in
> > index 81e5d06..23cc284 100644
> > --- a/package/rt-tests/Config.in
> > +++ b/package/rt-tests/Config.in
> > @@ -1,7 +1,5 @@
> > config BR2_PACKAGE_RT_TESTS
> > bool "rt-tests"
> > - # no _tid field in 'struct sigevent'
> > - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
>
> And it doesn't need thread support at all?
Indeed, threads are required.
So I should have put dependency on BR2_TOOLCHAIN_HAS_THREADS.
Thanks for pointing to this mistake.
If other patches for rt-tests are OK then I'll re-submit only the last
one.
-Alexey
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools
2014-11-10 9:59 [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Alexey Brodkin
` (3 preceding siblings ...)
2014-11-10 9:59 ` [Buildroot] [PATCH 4/4] rt-tests: allow building subset of tests with non-NPTL toolchains Alexey Brodkin
@ 2014-11-11 14:43 ` Thomas Petazzoni
2014-11-11 15:01 ` Alexey Brodkin
4 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2014-11-11 14:43 UTC (permalink / raw)
To: buildroot
Dear Alexey Brodkin,
On Mon, 10 Nov 2014 12:59:05 +0300, Alexey Brodkin wrote:
> Alexey Brodkin (4):
> rt-tests: rename patch to the new convention
> rt-tests: switch site from Debian snapshot to Linux's git
> rt-tests: bump version to 0.89
> rt-tests: allow building subset of tests with non-NPTL toolchains
Applied patches 1 to 3. Patch 4 not applied as a new version was sent.
However, I wanted to mention two things:
* You should never resend a new version of just one patch. Always send
the complete series again, even if only one patch has changed. I was
mistaken when looking at patchwork, and originally only applied the
patch removing the NPTL dependency, because it was available
standalone, outside of any series.
* You should use 'git format-patch -M' to enable rename detection. It
would have made patch 1 a lot smaller, and easier to review.
Thanks a lot!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread* [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools
2014-11-11 14:43 ` [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools Thomas Petazzoni
@ 2014-11-11 15:01 ` Alexey Brodkin
2014-11-11 15:10 ` Thomas Petazzoni
0 siblings, 1 reply; 12+ messages in thread
From: Alexey Brodkin @ 2014-11-11 15:01 UTC (permalink / raw)
To: buildroot
Hi Thomas,
On Tue, 2014-11-11 at 15:43 +0100, Thomas Petazzoni wrote:
> Dear Alexey Brodkin,
>
> On Mon, 10 Nov 2014 12:59:05 +0300, Alexey Brodkin wrote:
>
> > Alexey Brodkin (4):
> > rt-tests: rename patch to the new convention
> > rt-tests: switch site from Debian snapshot to Linux's git
> > rt-tests: bump version to 0.89
> > rt-tests: allow building subset of tests with non-NPTL toolchains
>
> Applied patches 1 to 3. Patch 4 not applied as a new version was sent.
> However, I wanted to mention two things:
>
> * You should never resend a new version of just one patch. Always send
> the complete series again, even if only one patch has changed. I was
> mistaken when looking at patchwork, and originally only applied the
> patch removing the NPTL dependency, because it was available
> standalone, outside of any series.
Indeed my bad, I was not sure if I may re-send only 1 patch so I asked
if that's ok but never got an answer here
http://permalink.gmane.org/gmane.comp.lib.uclibc.buildroot/99171
Nevertheless I understand that that's my fault and I'll try to not do
such silly things in the future, so thanks for this comment.
> * You should use 'git format-patch -M' to enable rename detection. It
> would have made patch 1 a lot smaller, and easier to review.
Hm, I didn't know about this actually.
I did "git mv" and believed that there's nothing else I may do to
simplify rename changes. Will do it this way next time.
-Alexey
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools
2014-11-11 15:01 ` Alexey Brodkin
@ 2014-11-11 15:10 ` Thomas Petazzoni
2014-11-11 20:59 ` Peter Korsgaard
0 siblings, 1 reply; 12+ messages in thread
From: Thomas Petazzoni @ 2014-11-11 15:10 UTC (permalink / raw)
To: buildroot
Dear Alexey Brodkin,
On Tue, 11 Nov 2014 15:01:17 +0000, Alexey Brodkin wrote:
> > * You should never resend a new version of just one patch. Always send
> > the complete series again, even if only one patch has changed. I was
> > mistaken when looking at patchwork, and originally only applied the
> > patch removing the NPTL dependency, because it was available
> > standalone, outside of any series.
>
> Indeed my bad, I was not sure if I may re-send only 1 patch so I asked
> if that's ok but never got an answer here
> http://permalink.gmane.org/gmane.comp.lib.uclibc.buildroot/99171
>
> Nevertheless I understand that that's my fault and I'll try to not do
> such silly things in the future, so thanks for this comment.
No problem! Everybody learns progressively how to do things :)
> > * You should use 'git format-patch -M' to enable rename detection. It
> > would have made patch 1 a lot smaller, and easier to review.
>
> Hm, I didn't know about this actually.
> I did "git mv" and believed that there's nothing else I may do to
> simplify rename changes. Will do it this way next time.
I must confess that I don't actually don't know precisely how git
encodes renames. But basically, my understanding is that even if you do
"git mv", "git format-patch" will encode a rename as a complete removal
+ a complete addition, because that's the only way, in the traditional
patch format, to express a rename. However, by passing -M to git
format-patch, you tell git that it can generate a git patch, making the
assumption that it's git that will be used to apply the patch, and not
just the basic "patch" tool. In this case, it can encode the rename in
a smarter way.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools
2014-11-11 15:10 ` Thomas Petazzoni
@ 2014-11-11 20:59 ` Peter Korsgaard
2014-11-11 22:15 ` Thomas Petazzoni
0 siblings, 1 reply; 12+ messages in thread
From: Peter Korsgaard @ 2014-11-11 20:59 UTC (permalink / raw)
To: buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes:
Hi,
> I must confess that I don't actually don't know precisely how git
> encodes renames. But basically, my understanding is that even if you do
Easy, it doesn't. It just stores blobs and the old and new files will
share the same blob as they are identical. The rename detection is only
for how you want the commit to PRESENTED.
> "git mv", "git format-patch" will encode a rename as a complete removal
> + a complete addition, because that's the only way, in the traditional
> patch format, to express a rename. However, by passing -M to git
> format-patch, you tell git that it can generate a git patch, making the
> assumption that it's git that will be used to apply the patch, and not
> just the basic "patch" tool. In this case, it can encode the rename in
> a smarter way.
Indeed. You can enable it by default with something like:
git config --global diff.renames copy
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 12+ messages in thread
* [Buildroot] [PATCH 0/4] rt-tests: patches rename & versoin bump & support of non-NPTL tools
2014-11-11 20:59 ` Peter Korsgaard
@ 2014-11-11 22:15 ` Thomas Petazzoni
0 siblings, 0 replies; 12+ messages in thread
From: Thomas Petazzoni @ 2014-11-11 22:15 UTC (permalink / raw)
To: buildroot
Dear Peter Korsgaard,
On Tue, 11 Nov 2014 21:59:04 +0100, Peter Korsgaard wrote:
> Indeed. You can enable it by default with something like:
>
> git config --global diff.renames copy
Ah, yes, that's what I have in my ~/.gitconfig, which explains why I
never use "git format-patch -M" and still have proper rename detection
enabled for all the patches I send. Something I must have enabled years
ago, and I forgot about it.
Thanks for the clarification anyway,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 12+ messages in thread