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 | 6 | ||||
-rwxr-xr-x | meta/recipes-rt/rt-tests/files/rt_bmark.py | 2 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests.inc | 6 | ||||
-rw-r--r-- | meta/recipes-rt/rt-tests/rt-tests_git.bb | 2 |
5 files changed, 9 insertions, 9 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 index 5410ec94e9..a1fc9e26a0 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 5a7caafe04cac805b5057db2632b0defe703eacd Mon Sep 17 00:00:00 2001 +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 @@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [other] 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index 3fbf882..04d3c0f 100644 +index 223a839..a735584 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 2.4 + VERSION = 2.6 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc 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/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 93fa390bba..70315c4694 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,7 +1,7 @@ -SRCREV = "ca4a6293da23ad0fd708ea1fecb2d465a9ea6093" -PV = "2.4" +SRCREV = "217cd8518c5f7777d490892aa9c765a6b2782cb5" +PV = "2.6" PE = "1" -SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main" +SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta/recipes-rt/rt-tests/rt-tests_git.bb b/meta/recipes-rt/rt-tests/rt-tests_git.bb index ef082131e2..1f48e143d4 100644 --- a/meta/recipes-rt/rt-tests/rt-tests_git.bb +++ b/meta/recipes-rt/rt-tests/rt-tests_git.bb @@ -27,7 +27,7 @@ do_install() { } do_install_ptest() { - cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH} + cp ${UNPACKDIR}/rt_bmark.py ${D}${PTEST_PATH} } RDEPENDS:${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc" |