recipes-rt: Update rt-tests, hwlatdetect, and core-image-rt images

new file mode 100644
index 0000000..8b493eb
@@ -0,0 +1,35 @@
+From 66765522b634952346f1a3ab7d00c7222a1f9361 Mon Sep 17 00:00:00 2001
+Message-Id: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com>
+From: Darren Hart <[email protected]>
+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 <[email protected]>
+CC: Clark Williams <[email protected]>
+CC: John Kacur <[email protected]>
+---
+ 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
+

68 lines not on this page · raw message

new file mode 100644
index 0000000..a850a2d
@@ -0,0 +1,24 @@
+pickDESCRIPTION = "Python hardware latency detector"
+HOMEPAGE = "http://git.kernel.org/?p=linux/kernel/git/clrkwllms/rt-tests.git"
+SECTION = "tests"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+RDEPENDS = "python python-subprocess python-textutils"
+RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"
+
+require rt-tests.inc
+
+PR = "${INC_PR}.0"
+
+EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages"
+
+do_compile() {
+	oe_runmake hwlatdetect
+}
+
+do_install() {
+        oe_runmake install_hwlatdetect DESTDIR=${D} SBINDIR=${sbindir} \
+	           MANDIR=${mandir} INCLUDEDIR=${includedir}
+}
+
+FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py"

new file mode 100644
index 0000000..f511532
@@ -0,0 +1,18 @@
+# Version v0.84
+SRCREV = "857cdd5320ce1f293f5dbcbec79cc8fe22b0bebf"
+
+PR = "r0"
+
+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"
+
+INC_PR = "r0"
+
+S = "${WORKDIR}/git"
+
+# need to append rt-tests' default CFLAGS to ours
+CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnulli"
+
+# calling 'uname -m' is broken on crossbuilds
+EXTRA_OEMAKE = "NUMA=0"

index c54936e..c3964d2 100644
@@ -6,20 +6,13 @@ LICENSE = "GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
                     file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
-# Version v0.84
-SRCREV = "857cdd5320ce1f293f5dbcbec79cc8fe22b0bebf"
 
-PR = "r0"
+require rt-tests.inc
 
-SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git"
+PR = "${INC_PR}.0"
 
-S = "${WORKDIR}/git"
-
-# need to append rt-tests' default CFLAGS to ours
-CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnulli"
-
-# calling 'uname -m' is broken on crossbuilds
-EXTRA_OEMAKE = "NUMA=0"
+# Do not install hwlatdetect
+EXTRA_OEMAKE += "PYLIB=''"
 
 do_install() {
         oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \

index d3bf3e9..58f983f 100644
@@ -7,6 +7,6 @@ DEPENDS = "linux-yocto-rt"
 
 IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug tools-profile tools-testapps debug-tweaks"
 
-IMAGE_INSTALL += "rt-tests kernel-dev"
+IMAGE_INSTALL += "rt-tests hwlatdetect kernel-dev"
 
 LICENSE = "MIT"

index f749bfe..cab6f8b 100644
@@ -4,6 +4,6 @@ DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
 real-time test suite and tools appropriate for real-time use."
 DEPENDS = "linux-yocto-rt"
 
-IMAGE_INSTALL += "rt-tests"
+IMAGE_INSTALL += "rt-tests hwlatdetect"
 
 LICENSE = "MIT"

deleted file mode 100644
index 09a5d7b..0000000
@@ -1,89 +0,0 @@
-From: Darren Hart <[email protected]>
-Subject: [PATCH rt-tests RFC 4/6] Makefile: Support user supplied CFLAGS and LDFLAGS
-Date: Thu, 22 Mar 2012 02:14:04 +0100
-
-Accept user supplied CFLAGS and LDFLAGS, overwriting the
-Makefile supplied versions. This can cause the build to
-fail if the user does not provide at least what the Makefile
-defines, but so be it.
-
-Upstream-Status: Submitted [[email protected]]
-
-Signed-off-by: Darren Hart <[email protected]>
-CC: Clark Williams <[email protected]>
-CC: John Kacur <[email protected]>
-CC: Denys Dmytriyenko <[email protected]>
-Signed-off-by: John Kacur <[email protected]>
----
- Makefile |   25 +++++++++++++------------
- 1 files changed, 13 insertions(+), 12 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 4038dcc..e1edf6c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -20,7 +20,8 @@ ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),)
- NUMA 	:= 1
- endif
- 
--CFLAGS = -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-+CFLAGS ?= -D_GNU_SOURCE -Wall -Wno-nonnull -Isrc/include
-+LDFLAGS ?=
- 
- PYLIB  := $(shell python -c 'import distutils.sysconfig;  print distutils.sysconfig.get_python_lib()')
- 
-@@ -61,41 +62,41 @@ all: $(TARGETS) hwlatdetect
- -include $(sources:.c=.d)
- 
- cyclictest: cyclictest.o rt-utils.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(NUMA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(NUMA_LIBS)
- 
- signaltest: signaltest.o rt-utils.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- pi_stress: pi_stress.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(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
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- ptsematest: ptsematest.o rt-utils.o rt-get_cpu.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- sigwaittest: sigwaittest.o rt-utils.o rt-get_cpu.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- svsematest: svsematest.o rt-utils.o rt-get_cpu.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- pmqtest: pmqtest.o rt-utils.o rt-get_cpu.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- sendme: sendme.o rt-utils.o rt-get_cpu.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(EXTRA_LIBS)
- 
- pip_stress: pip_stress.o error.o rt-utils.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- hackbench: hackbench.o
--	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
- 
- CLEANUP  = $(TARGETS) *.o .depend *.*~ *.orig *.rej rt-tests.spec *.d
- CLEANUP += $(if $(wildcard .git), ChangeLog)
--- 
-1.7.7.6

similarity index 79%
rename from meta/recipes-rt/rt-tests/rt-tests_0.83.bb
rename to meta/recipes-rt/rt-tests/rt-tests_0.84.bb
index 6c4931e..c54936e 100644
@@ -6,15 +6,12 @@ LICENSE = "GPLv2 & GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=ce162fe491d19d2ec67dff6dbc938d50 \
                     file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
-# Version v0.83
-SRCREV = "5f1e84f8b015df3ff950056494134eca3f640d70"
+# Version v0.84
+SRCREV = "857cdd5320ce1f293f5dbcbec79cc8fe22b0bebf"
 
-# git -> 0.83 needs a PE bump
-PE = "1"
-PR = "r2"
+PR = "r0"
 
-SRC_URI = "git://github.com/clrkwllms/rt-tests.git \
-           file://makefile-support-user-cflags-ldflags.patch"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/clrkwllms/rt-tests.git"
 
 S = "${WORKDIR}/git"