From 3276fdb880979bb3572cbb36602b7eefb7896929 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 2 Nov 2020 17:48:57 +0100 Subject: rt-tests/hwlatdetect: upgrade 1.8 -> 1.9 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...file-Allow-for-CC-and-AR-to-be-overridden.patch | 7 +++-- meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb | 26 ---------------- meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb | 26 ++++++++++++++++ meta/recipes-rt/rt-tests/rt-tests.inc | 2 +- meta/recipes-rt/rt-tests/rt-tests_1.8.bb | 35 ---------------------- meta/recipes-rt/rt-tests/rt-tests_1.9.bb | 35 ++++++++++++++++++++++ 6 files changed, 66 insertions(+), 65 deletions(-) delete mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb create mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb delete mode 100644 meta/recipes-rt/rt-tests/rt-tests_1.8.bb create mode 100644 meta/recipes-rt/rt-tests/rt-tests_1.9.bb (limited to 'meta/recipes-rt') diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index c18928ed02..8fd94b176c 100644 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From caaa142826504ad0375f9d21c558f10f31305cdb Mon Sep 17 00:00:00 2001 +From f89d6d6d23e0dacfd0008f686a457d536edc406a Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -9,16 +9,17 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb. Signed-off-by: Randy Witt Upstream-Status: Inappropriate [other] + --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 05fc5ed..7a289c8 100644 +index c3ebbd7..2176835 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 1.8 + VERSION = 1.9 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.8.bb deleted file mode 100644 index 5f61c4ecdd..0000000000 --- a/meta/recipes-rt/rt-tests/hwlatdetect_1.8.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-core " -RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb new file mode 100644 index 0000000000..5f61c4ecdd --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_1.9.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-core " +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 5d28c7e63e..2dd890cf95 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ # Version 1.8 -SRCREV = "9f78b91f057e63b0c241012ce36b57168133eefb" +SRCREV = "21c1df7d2ee199ac619cbb1806a38d15e7e95c09" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.8.bb b/meta/recipes-rt/rt-tests/rt-tests_1.8.bb deleted file mode 100644 index 2834cabcd4..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_1.8.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Real-Time preemption testcases" -HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" -SECTION = "tests" -DEPENDS = "linux-libc-headers virtual/libc numactl" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -require rt-tests.inc -inherit ptest - -SRC_URI += " \ - file://run-ptest \ - file://rt_bmark.py \ - file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ - " - -# rt-tests needs PI mutex support in libc -COMPATIBLE_HOST_libc-musl = 'null' - -# 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-ng python3 python3-multiprocessing python3-datetime python3-misc" - -FILES_${PN} += "${prefix}/src/backfire" -RDEPENDS_${PN} += "bash" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.9.bb b/meta/recipes-rt/rt-tests/rt-tests_1.9.bb new file mode 100644 index 0000000000..2834cabcd4 --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_1.9.bb @@ -0,0 +1,35 @@ +SUMMARY = "Real-Time preemption testcases" +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +DEPENDS = "linux-libc-headers virtual/libc numactl" +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +require rt-tests.inc +inherit ptest + +SRC_URI += " \ + file://run-ptest \ + file://rt_bmark.py \ + file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ + " + +# rt-tests needs PI mutex support in libc +COMPATIBLE_HOST_libc-musl = 'null' + +# 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-ng python3 python3-multiprocessing python3-datetime python3-misc" + +FILES_${PN} += "${prefix}/src/backfire" +RDEPENDS_${PN} += "bash" -- cgit 1.2.3-korg