diff options
Diffstat (limited to 'meta/recipes-rt')
-rw-r--r-- | meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch | 35 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch | 68 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch | 50 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests.inc | 7 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests_0.89.bb (renamed from meta/recipes-rt/rt-tests/rt-tests_0.87.bb) | 0 |
5 files changed, 2 insertions, 158 deletions
diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch b/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch deleted file mode 100644 index 8b493eb1f1..0000000000 --- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 66765522b634952346f1a3ab7d00c7222a1f9361 Mon Sep 17 00:00:00 2001 -Message-Id: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> -From: Darren Hart <dvhart@linux.intel.com> -Date: Tue, 11 Sep 2012 15:19:30 -0700 -Subject: [PATCH 1/2] rt-tests: Allow for user-specified PYLIB - -Upstream-Status: Submitted - -Allow users (build systems) to specify PYLIB. This allows for a -cross-build-system to specify the target PYLIB rather than the host -PYLIB. - -Signed-off-by: Darren Hart <dvhart@linux.intel.com> -CC: Clark Williams <williams@redhat.com> -CC: John Kacur <jkacur@redhat.com> ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3a82407..61e2f9f 100644 ---- a/Makefile -+++ b/Makefile -@@ -23,7 +23,7 @@ endif - CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include - LDFLAGS ?= - --PYLIB := $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') -+PYLIB ?= $(shell python -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()') - - ifndef DEBUG - CFLAGS += -O2 --- -1.7.11.4 - diff --git a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch b/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch deleted file mode 100644 index bc6136f1de..0000000000 --- a/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch +++ /dev/null @@ -1,68 +0,0 @@ -From af93e580d005a2bba6ed36528003af4cf631adb8 Mon Sep 17 00:00:00 2001 -Message-Id: <af93e580d005a2bba6ed36528003af4cf631adb8.1347419597.git.dvhart@linux.intel.com> -In-Reply-To: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> -References: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> -From: Darren Hart <dvhart@linux.intel.com> -Date: Tue, 11 Sep 2012 14:51:10 -0700 -Subject: [PATCH 2/2] rt-tests: Break out install_hwlatdetect - -Upstream-Status: Submitted - -Allow hwlatdetect to be installed independently of the rest of the -tests. This is convenient for build systems that package it separately -due to the python dependency. - -Signed-off-by: Darren Hart <dvhart@linux.intel.com> -CC: Clark Williams <williams@redhat.com> -CC: John Kacur <jkacur@redhat.com> ---- - Makefile | 18 +++++++++++------- - 1 file changed, 11 insertions(+), 7 deletions(-) - -diff --git a/Makefile b/Makefile -index 61e2f9f..636e63b 100644 ---- a/Makefile -+++ b/Makefile -@@ -119,21 +119,15 @@ changelog: - git log >ChangeLog - - .PHONY: install --install: all -+install: all install_hwlatdetect - mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man4" - mkdir -p "$(DESTDIR)$(srcdir)" "$(DESTDIR)$(mandir)/man8" - cp $(TARGETS) "$(DESTDIR)$(bindir)" -- if test -n "$(PYLIB)" ; then \ -- install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ -- rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ -- ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ -- fi - install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" - install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" - gzip src/backfire/backfire.4 -c >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" - gzip src/cyclictest/cyclictest.8 -c >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" - gzip src/pi_tests/pi_stress.8 -c >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" -- gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" - gzip src/ptsematest/ptsematest.8 -c >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" - gzip src/sigwaittest/sigwaittest.8 -c >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" - gzip src/svsematest/svsematest.8 -c >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" -@@ -141,6 +135,16 @@ install: all - gzip src/backfire/sendme.8 -c >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" - gzip src/hackbench/hackbench.8 -c >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" - -+.PHONY: install_hwlatdetect -+install_hwlatdetect: hwlatdetect -+ if test -n "$(PYLIB)" ; then \ -+ mkdir -p "$(DESTDIR)$(bindir)" "$(DESTDIR)$(mandir)/man8" ; \ -+ install -D -m 755 src/hwlatdetect/hwlatdetect.py $(DESTDIR)$(PYLIB)/hwlatdetect.py ; \ -+ rm -f "$(DESTDIR)$(bindir)/hwlatdetect" ; \ -+ ln -s $(PYLIB)/hwlatdetect.py "$(DESTDIR)$(bindir)/hwlatdetect" ; \ -+ gzip src/hwlatdetect/hwlatdetect.8 -c >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ -+ fi -+ - .PHONY: release - release: clean changelog - mkdir -p releases --- -1.7.11.4 - diff --git a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch deleted file mode 100644 index e4202823e3..0000000000 --- a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 82d28701486ba5a699544a168448bf93b1ccd7b1 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Thu, 6 Dec 2012 11:26:14 +0800 -Subject: [PATCH] Added missing dependencies - -Upstream-Status: Submitted [linux-rt-users] - -The following targets missed dependency on librttest.a: -pi_stress -rt-migrate-test -hackbench - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile b/Makefile -index fd3cdb3..60707a7 100644 ---- a/Makefile -+++ b/Makefile -@@ -68,14 +68,14 @@ cyclictest: cyclictest.o librttest.a - signaltest: signaltest.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - --pi_stress: pi_stress.o -+pi_stress: pi_stress.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - hwlatdetect: src/hwlatdetect/hwlatdetect.py - chmod +x src/hwlatdetect/hwlatdetect.py - ln -s src/hwlatdetect/hwlatdetect.py hwlatdetect - --rt-migrate-test: rt-migrate-test.o -+rt-migrate-test: rt-migrate-test.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - ptsematest: ptsematest.o librttest.a -@@ -96,7 +96,7 @@ sendme: sendme.o librttest.a - pip_stress: pip_stress.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - --hackbench: hackbench.o -+hackbench: hackbench.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) - - librttest.a: rt-utils.o error.o rt-get_cpu.o --- -1.7.9.5 - diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 81f4f2b109..1d876b0684 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,10 +1,7 @@ -# Version v0.87 -SRCREV = "b0413ae5ed802004fb0c4af74a1757381fd2b91f" +# Version v0.89 +SRCREV = "9164ec4db2645f52ffdd20e6d1b72bb0411ab40e" SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git \ - file://0001-rt-tests-Allow-for-user-specified-PYLIB.patch \ - file://0002-rt-tests-Break-out-install_hwlatdetect.patch \ - file://added-missing-dependencies.patch \ file://hackbench-fix-error-check.patch \ " diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.87.bb b/meta/recipes-rt/rt-tests/rt-tests_0.89.bb index df646de8ed..df646de8ed 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_0.87.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_0.89.bb |