From 2b6c5cc41c55e11509d5c1268dc1baab0a975d59 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 3 Jun 2016 12:14:39 +0300 Subject: rt-tests, hwlatdetect: upgrade to 2.0 0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch has been merged upstream Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...t-CC-AR-variable-only-if-it-doesn-t-have-.patch | 30 -------------------- meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb | 26 ----------------- meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb | 26 +++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests.inc | 3 +- meta/recipes-rt/rt-tests/rt-tests_0.96.bb | 33 ---------------------- meta/recipes-rt/rt-tests/rt-tests_2.0.bb | 33 ++++++++++++++++++++++ 6 files changed, 60 insertions(+), 91 deletions(-) delete mode 100644 meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch delete mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb create mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb delete mode 100644 meta/recipes-rt/rt-tests/rt-tests_0.96.bb create mode 100644 meta/recipes-rt/rt-tests/rt-tests_2.0.bb (limited to 'meta/recipes-rt/rt-tests') diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch deleted file mode 100644 index 00fcc7d722..0000000000 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9640dde4241e1314b8e8ea35b0c8dab0b30ae51f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 3 Jan 2016 10:50:56 -0800 -Subject: [PATCH] Makefile: Set CC/AR variable only if it doesn't have a value - -This helps it compile with clang or any other compilers besides gcc - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1e4b7d1..2c2d396 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - VERSION = 0.96 --CC=$(CROSS_COMPILE)gcc --AR=$(CROSS_COMPILE)ar -+CC?=$(CROSS_COMPILE)gcc -+AR?=$(CROSS_COMPILE)ar - - OBJDIR = bld - --- -2.6.4 - diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb deleted file mode 100644 index 012b2dd0a7..0000000000 --- a/meta/recipes-rt/rt-tests/hwlatdetect_0.96.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/hwlatdetect_2.0.bb b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.bb new file mode 100644 index 0000000000..012b2dd0a7 --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_2.0.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/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 76f9b3a341..fd6500bfad 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,6 +1,5 @@ # Version v0.96 -PV = "0.96" -SRCREV = "24f8c0175e04bab78e7555698e34d7002b01c87f" +SRCREV = "e1b1537a20b35af75a49bf55dcf70296f8a62467" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" diff --git a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb b/meta/recipes-rt/rt-tests/rt-tests_0.96.bb deleted file mode 100644 index 2f96fea9b5..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_0.96.bb +++ /dev/null @@ -1,33 +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://0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch \ - file://run-ptest \ - file://rt_bmark.py \ - " -# Do not install hwlatdetect -EXTRA_OEMAKE += "PYLIB='' CROSS_COMPILE=${TARGET_PREFIX}" - -CFLAGS_prepend = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" - -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_2.0.bb b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb new file mode 100644 index 0000000000..21780d19ed --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb @@ -0,0 +1,33 @@ +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='' CROSS_COMPILE=${TARGET_PREFIX}" + +CFLAGS_prepend = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}" + +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 v1.2.3