diff options
Diffstat (limited to 'meta/recipes-rt')
-rw-r--r-- | meta/recipes-rt/README | 2 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 29 | ||||
-rwxr-xr-x | meta/recipes-rt/rt-tests/files/rt_bmark.py | 2 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/hwlatdetect_git.bb (renamed from meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch | 62 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests.inc | 11 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests_1.1.bb | 36 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests_git.bb | 36 |
8 files changed, 74 insertions, 112 deletions
diff --git a/meta/recipes-rt/README b/meta/recipes-rt/README index 7d7558de49..0144d68b70 100644 --- a/meta/recipes-rt/README +++ b/meta/recipes-rt/README @@ -10,4 +10,4 @@ If you are creating a new BSP which should use linux-yocto-rt by default, use the line above in the $MACHINE.conf in your BSP layer, and specify the following in a linux-yocto-rt bbappend recipe: -COMPATIBLE_MACHINE_$MACHINE = $MACHINE +COMPATIBLE_MACHINE:$MACHINE = $MACHINE 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 new file mode 100644 index 0000000000..a1fc9e26a0 --- /dev/null +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -0,0 +1,29 @@ +From 7cf4cf097895bd4c3f3d3a6f783c766b3173cf1a Mon Sep 17 00:00:00 2001 +From: Randy Witt <randy.e.witt@intel.com> +Date: Fri, 16 Oct 2020 16:54:30 -0700 +Subject: [PATCH] Makefile: Allow for CC and AR to be overridden + +The Makefile previously allowed for this but it was removed upstream in +commit 7763cf316d7896fa05b816a46998f0827ab6e6eb. + +Signed-off-by: Randy Witt <randy.e.witt@intel.com> + +Upstream-Status: Inappropriate [other] + +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 223a839..a735584 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,6 +1,6 @@ + VERSION = 2.6 +-CC = $(CROSS_COMPILE)gcc +-AR = $(CROSS_COMPILE)ar ++CC ?= $(CROSS_COMPILE)gcc ++AR ?= $(CROSS_COMPILE)ar + + OBJDIR = bld + diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py index 3b84447a0f..2a4eed412f 100755 --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py @@ -265,7 +265,7 @@ cmd = ("cyclictest", "-d", str(interval_delta), "-l", str(loop_count) ) -rex = re.compile(b"C:\s*(\d+).*Min:\s*(\d+).*Avg:\s*(\d+).*Max:\s*(\d+)") +rex = re.compile(r"C:\s*(\d+).*Min:\s*(\d+).*Avg:\s*(\d+).*Max:\s*(\d+)") def run_cyclictest_once(): res = subprocess.check_output(cmd) diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb b/meta/recipes-rt/rt-tests/hwlatdetect_git.bb index 5f61c4ecdd..2dcc80965a 100644 --- a/meta/recipes-rt/rt-tests/hwlatdetect_1.1.bb +++ b/meta/recipes-rt/rt-tests/hwlatdetect_git.bb @@ -2,7 +2,7 @@ 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" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" require rt-tests.inc @@ -21,6 +21,6 @@ do_install() { 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" +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-1.1/0001-gzip-with-n-for-build-reproducibilty.patch b/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch deleted file mode 100644 index 3bafbbe08f..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests-1.1/0001-gzip-with-n-for-build-reproducibilty.patch +++ /dev/null @@ -1,62 +0,0 @@ -From aabf518e2e61a882b925f9d2ac53dafa7a041a0a Mon Sep 17 00:00:00 2001 -From: Jeremy Puhlman <jpuhlman@mvista.com> -Date: Tue, 25 Feb 2020 22:58:59 +0000 -Subject: [PATCH] gzip with -n for build reproducibilty - -The date can get encoded in the header of the gz file, which -causes the binary files between two different builds of the -same data to be different. Add -n for reproducibilty - -Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com> - -Upstream-Status: Submitted [mailinglist] - ---- - Makefile | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Makefile b/Makefile -index a54d82b..e9f0d5a 100644 ---- a/Makefile -+++ b/Makefile -@@ -168,17 +168,17 @@ install: all install_hwlatdetect - cp $(TARGETS) "$(DESTDIR)$(bindir)" - install -D -m 644 src/backfire/backfire.c "$(DESTDIR)$(srcdir)/backfire/backfire.c" - install -m 644 src/backfire/Makefile "$(DESTDIR)$(srcdir)/backfire/Makefile" -- gzip -c src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" -- gzip -c src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" -- gzip -c src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" -- gzip -c src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" -- gzip -c src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" -- gzip -c src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" -- gzip -c src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" -- gzip -c src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" -- gzip -c src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" -- gzip -c src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" -- gzip -c src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" -+ gzip -nc src/backfire/backfire.4 >"$(DESTDIR)$(mandir)/man4/backfire.4.gz" -+ gzip -nc src/cyclictest/cyclictest.8 >"$(DESTDIR)$(mandir)/man8/cyclictest.8.gz" -+ gzip -nc src/pi_tests/pi_stress.8 >"$(DESTDIR)$(mandir)/man8/pi_stress.8.gz" -+ gzip -nc src/ptsematest/ptsematest.8 >"$(DESTDIR)$(mandir)/man8/ptsematest.8.gz" -+ gzip -nc src/rt-migrate-test/rt-migrate-test.8 >"$(DESTDIR)$(mandir)/man8/rt-migrate-test.8.gz" -+ gzip -nc src/sigwaittest/sigwaittest.8 >"$(DESTDIR)$(mandir)/man8/sigwaittest.8.gz" -+ gzip -nc src/svsematest/svsematest.8 >"$(DESTDIR)$(mandir)/man8/svsematest.8.gz" -+ gzip -nc src/pmqtest/pmqtest.8 >"$(DESTDIR)$(mandir)/man8/pmqtest.8.gz" -+ gzip -nc src/backfire/sendme.8 >"$(DESTDIR)$(mandir)/man8/sendme.8.gz" -+ gzip -nc src/hackbench/hackbench.8 >"$(DESTDIR)$(mandir)/man8/hackbench.8.gz" -+ gzip -nc src/signaltest/signaltest.8 >"$(DESTDIR)$(mandir)/man8/signaltest.8.gz" - - .PHONY: install_hwlatdetect - install_hwlatdetect: hwlatdetect -@@ -187,7 +187,7 @@ install_hwlatdetect: hwlatdetect - 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 -c src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ -+ gzip -nc src/hwlatdetect/hwlatdetect.8 >"$(DESTDIR)$(mandir)/man8/hwlatdetect.8.gz" ; \ - fi - - .PHONY: tarball --- -2.23.0 - diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 6e3afafce4..70315c4694 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,12 +1,7 @@ -# Version 1.1 -SRCREV = "dff174f994f547a5785d32454865f140daacb0f5" +SRCREV = "217cd8518c5f7777d490892aa9c765a6b2782cb5" +PV = "2.6" PE = "1" -SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git" -# 1.2 and up seem to be development versions -UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(?!1\.[2-8])(\d+(\.\d+)+))" +SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" S = "${WORKDIR}/git" - -# calling 'uname -m' is broken on crossbuilds -EXTRA_OEMAKE = "NUMA=0" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb b/meta/recipes-rt/rt-tests/rt-tests_1.1.bb deleted file mode 100644 index dad252b4ed..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_1.1.bb +++ /dev/null @@ -1,36 +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 \ - file://0001-gzip-with-n-for-build-reproducibilty.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" diff --git a/meta/recipes-rt/rt-tests/rt-tests_git.bb b/meta/recipes-rt/rt-tests/rt-tests_git.bb new file mode 100644 index 0000000000..1f48e143d4 --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "Real-Time preemption testcases" +HOMEPAGE = "https://wiki.linuxfoundation.org/realtime/documentation/start" +DESCRIPTION = "The main aim of the PREEMPT_RT patch is to minimize the amount of kernel code that is non-preemptible Therefore several substitution mechanisms and new mechanisms are implemented." +SECTION = "tests" +DEPENDS = "linux-libc-headers virtual/libc numactl" +LICENSE = "GPL-2.0-only & GPL-2.0-or-later" +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 ${UNPACKDIR}/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" |