From 74603c4ab47ae5729b05ac538c4f05e37af463bc Mon Sep 17 00:00:00 2001 From: "Maxin B. John" Date: Tue, 16 Jun 2015 23:25:07 +0200 Subject: rt-tests: bump version to v0.92 Version upgrade to v0.92 Rebased below listed patch to newer source code: added-missing-dependencies.patch (From OE-Core rev: 9c0db9cedc05e80f6ddef29ec3eaeaa1063e51c7) Signed-off-by: Maxin B. John Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../files/added-missing-dependencies.patch | 36 +++++++++------------- meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb | 23 -------------- meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb | 23 ++++++++++++++ meta/recipes-rt/rt-tests/rt-tests.inc | 6 ++-- meta/recipes-rt/rt-tests/rt-tests_0.91.bb | 30 ------------------ meta/recipes-rt/rt-tests/rt-tests_0.92.bb | 30 ++++++++++++++++++ 6 files changed, 70 insertions(+), 78 deletions(-) delete mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb create mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb delete mode 100644 meta/recipes-rt/rt-tests/rt-tests_0.91.bb create mode 100644 meta/recipes-rt/rt-tests/rt-tests_0.92.bb (limited to 'meta/recipes-rt') diff --git a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch index e4202823e3..0bf768eb9d 100644 --- a/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch +++ b/meta/recipes-rt/rt-tests/files/added-missing-dependencies.patch @@ -1,50 +1,42 @@ -From 82d28701486ba5a699544a168448bf93b1ccd7b1 Mon Sep 17 00:00:00 2001 -From: Jackie Huang -Date: Thu, 6 Dec 2012 11:26:14 +0800 +From 3f948f22d9106a2b957d1d430b16a7c51ccfc067 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Tue, 16 Jun 2015 22:53:23 +0200 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 +Signed-off-by: Maxin B. John --- - Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index fd3cdb3..60707a7 100644 +index a48e759..7a3f192 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 +@@ -85,7 +85,7 @@ 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) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) ptsematest: ptsematest.o librttest.a -@@ -96,7 +96,7 @@ sendme: sendme.o librttest.a +@@ -106,7 +106,7 @@ sendme: sendme.o librttest.a pip_stress: pip_stress.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) $(RTTESTLIB) -hackbench: hackbench.o +hackbench: hackbench.o librttest.a - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBS) - librttest.a: rt-utils.o error.o rt-get_cpu.o + librttest.a: rt-utils.o error.o rt-get_cpu.o rt-sched.o -- -1.7.9.5 +1.9.1 diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb deleted file mode 100644 index 8319eb987a..0000000000 --- a/meta/recipes-rt/rt-tests/hwlatdetect_0.91.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "Hardware latency detector" -DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." -HOMEPAGE = "http://git.kernel.org/?p=linux/kernel/git/clrkwllms/rt-tests.git" -SECTION = "tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -require rt-tests.inc - -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" -RDEPENDS_${PN} = "python python-subprocess python-textutils" -RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb new file mode 100644 index 0000000000..8319eb987a --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_0.92.bb @@ -0,0 +1,23 @@ +SUMMARY = "Hardware latency detector" +DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." +HOMEPAGE = "http://git.kernel.org/?p=linux/kernel/git/clrkwllms/rt-tests.git" +SECTION = "tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +require rt-tests.inc + +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" +RDEPENDS_${PN} = "python python-subprocess python-textutils" +RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 68a972ab4e..e63182a711 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,6 +1,6 @@ -# Version v0.91 -PV = "0.91" -SRCREV = "3fed00ff8d2c0cdbc5ba078cbd60ce3cfcee615f" +# Version v0.92 +PV = "0.92" +SRCREV = "5f9f1e3fe327440a9d405f4af8feb16ff7a909eb" 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 \ diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.91.bb b/meta/recipes-rt/rt-tests/rt-tests_0.91.bb deleted file mode 100644 index fbe2f669e8..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_0.91.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Real-Time preemption testcases" -HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" -SECTION = "tests" -DEPENDS = "linux-libc-headers virtual/libc" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ - file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=e768b8da44555fe63f65e5c497844cb5 \ - file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949" - -require rt-tests.inc -inherit ptest - -SRC_URI += "file://run-ptest \ - file://rt_bmark.py \ - " -# Do not install hwlatdetect -EXTRA_OEMAKE += "PYLIB=''" - -do_install() { - oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ - INCLUDEDIR=${includedir} -} - -do_install_ptest() { - cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH} -} - -RDEPENDS_${PN}-ptest += " stress python python-subprocess python-multiprocessing python-datetime python-re python-lang" - -FILES_${PN} += "${prefix}/src/backfire" diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.92.bb b/meta/recipes-rt/rt-tests/rt-tests_0.92.bb new file mode 100644 index 0000000000..fbe2f669e8 --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_0.92.bb @@ -0,0 +1,30 @@ +SUMMARY = "Real-Time preemption testcases" +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +DEPENDS = "linux-libc-headers virtual/libc" +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ + file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=e768b8da44555fe63f65e5c497844cb5 \ + file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949" + +require rt-tests.inc +inherit ptest + +SRC_URI += "file://run-ptest \ + file://rt_bmark.py \ + " +# Do not install hwlatdetect +EXTRA_OEMAKE += "PYLIB=''" + +do_install() { + oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ + INCLUDEDIR=${includedir} +} + +do_install_ptest() { + cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH} +} + +RDEPENDS_${PN}-ptest += " stress python python-subprocess python-multiprocessing python-datetime python-re python-lang" + +FILES_${PN} += "${prefix}/src/backfire" -- cgit 1.2.3-korg