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 new file mode 100644 index 0000000000..8b493eb1f1 --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/0001-rt-tests-Allow-for-user-specified-PYLIB.patch @@ -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 +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 +CC: Clark Williams +CC: John Kacur +--- + 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 new file mode 100644 index 0000000000..bc6136f1de --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/0002-rt-tests-Break-out-install_hwlatdetect.patch @@ -0,0 +1,68 @@ +From af93e580d005a2bba6ed36528003af4cf631adb8 Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> +References: <66765522b634952346f1a3ab7d00c7222a1f9361.1347419597.git.dvhart@linux.intel.com> +From: Darren Hart +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 +CC: Clark Williams +CC: John Kacur +--- + 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/hwlatdetect_0.84.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.84.bb new file mode 100644 index 0000000000..a850a2d42a --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.84.bb @@ -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" diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc new file mode 100644 index 0000000000..f51153238e --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -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" diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.84.bb b/meta/recipes-rt/rt-tests/rt-tests_0.84.bb index c54936e13b..c3964d2215 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_0.84.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_0.84.bb @@ -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} \