From 799a7b74f1219040fe2d43dcdcd145600a9fecbd Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 1 Nov 2016 15:30:07 +0200 Subject: rt-tests: fix the recipe version to match upstream Upstream had a 2.0 tag for a while, then removed it and added a 1.1 tag :-/ Let's make it match to avoid confusion. There's only one new commit added, which adds a missing manpage. Also, update the outdated version comment in rt-tests.inc Signed-off-by: Alexander Kanavin Signed-off-by: Ross Burton --- meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb | 26 ++++++++++++++++++++++++ meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb | 26 ------------------------ meta/recipes-rt/rt-tests/rt-tests.inc | 5 +++-- meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 31 +++++++++++++++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_2.0.bb | 31 ----------------------------- 5 files changed, 60 insertions(+), 59 deletions(-) create mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb delete mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb create mode 100644 meta/recipes-rt/rt-tests/rt-tests_1.1.bb delete mode 100644 meta/recipes-rt/rt-tests/rt-tests_2.0.bb diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb new file mode 100644 index 0000000000..012b2dd0a7 --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb @@ -0,0 +1,26 @@ +SUMMARY = "Hardware latency detector" +DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +require rt-tests.inc +inherit python3-dir + +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} + + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py +} + +FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py" +RDEPENDS_${PN} = "python3 python3-subprocess python3-textutils" +RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb deleted file mode 100644 index 012b2dd0a7..0000000000 --- a/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Hardware latency detector" -DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." -HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" -SECTION = "tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -require rt-tests.inc -inherit python3-dir - -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} - - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py -} - -FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py" -RDEPENDS_${PN} = "python3 python3-subprocess python3-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 d832828e97..5606d8e385 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,6 @@ -# Version v0.96 -SRCREV = "e1b1537a20b35af75a49bf55dcf70296f8a62467" +# Version 1.1 +SRCREV = "dff174f994f547a5785d32454865f140daacb0f5" +PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb new file mode 100644 index 0000000000..4336c50d63 --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb @@ -0,0 +1,31 @@ +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 python3 python3-subprocess python3-multiprocessing python3-datetime python3-re python3-lang python3-misc" + +FILES_${PN} += "${prefix}/src/backfire" diff --git a/meta/recipes-rt/rt-tests/rt-tests_2.0.bb b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb deleted file mode 100644 index 4336c50d63..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_2.0.bb +++ /dev/null @@ -1,31 +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 python3 python3-subprocess python3-multiprocessing python3-datetime python3-re python3-lang python3-misc" - -FILES_${PN} += "${prefix}/src/backfire" -- cgit 1.2.3-korg