Skip to contentSkip to conversation

rt-tests: drop Makefile CC/AR patch and use EXTRA_OEMAKE

PATCH New Jaipaul Cheernam 1 participant 2 messages Sep 25

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 rt-tests: drop Makefile CC/AR patch and use EXTRA_OEMAKE

- The 0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch changed upstream's 'CC =' / 'AR =' to '?=' so OE's toolchain would take effect. Passing CC/AR via EXTRA_OEMAKE overrides the makefile assignments on the command line instead, so the local patch is no longer needed

- Verified by building qemux86-64 and qemuarm64: both do_compile and do_install use the cross CC/AR (e.g. aarch64-oe-linux-gcc)

---
 ...Allow-for-CC-and-AR-to-be-overridden.patch | 33 -------------------
 meta/recipes-rt/rt-tests/rt-tests_git.bb      |  6 +++-
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch
meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch deleted +0 -33
deleted file mode 100644
index a39781908ec..00000000000
@@ -1,33 +0,0 @@
-From 7cf4cf097895bd4c3f3d3a6f783c766b3173cf1a Mon Sep 17 00:00:00 2001
-From: Randy Witt <[email protected]>
-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 <[email protected]>
-
-Upstream-Status: Inappropriate [other]
----
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 83d2a33..e757839 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,8 +2,8 @@
- include feature/test-feature.mak
- 
- VERSION = 2.10
--CC = $(CROSS_COMPILE)gcc
--AR = $(CROSS_COMPILE)ar
-+CC ?= $(CROSS_COMPILE)gcc
-+AR ?= $(CROSS_COMPILE)ar
- 
- OBJDIR = bld
- 
--- 
-2.43.0
-
meta/recipes-rt/rt-tests/rt-tests_git.bb +5 -1
index aea3d82e202..d722755f522 100644
@@ -12,7 +12,6 @@ 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
@@ -21,6 +20,11 @@ COMPATIBLE_HOST:libc-musl = 'null'
 # Do not install hwlatdetect
 EXTRA_OEMAKE += "PYLIB=''"
 
+# Upstream Makefile hardcodes CC/AR with '=' (git.kernel.org rt-tests commit
+# 7763cf316d78). Pass them as make command-line args so they override those
+# assignments, avoiding a local Makefile patch.
+EXTRA_OEMAKE += "CC='${CC}' AR='${AR}'"
+
 do_install() {
         oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \
                            INCLUDEDIR=${includedir}
#1 lore raw

PATCH 1/1 rt-tests/hwlatdetect: upgrade 2.10 -> 2.11

Changes:

Ahmed S. Darwish (28):
cyclictest.8: Comment-out SPDX license tag cyclictest.8: Synopsis: Remove -U
cyclictest.8: Synopsis: Remove -w/-W cyclictest.8: Synopsis: Remove -y
cyclictest.8: Synopsis: Remove -h flag cyclictest.8: Standardize --verbose paragraph formatting cyclictest.8: Remove left-over comments cyclictest.8: Align source file to 75 columns cyclictest.8: Separate source sections cyclictest.8: Capitalize section headers cyclictest.8: Synopsis: Fix parameters list rendering cyclictest.8: Rework the Synopsis blurb cyclictest.8: Synopsis: Distinguish --help mode cyclictest.8: Group system-altering options cyclictest.8: Group sleep-mechanism (clock) options cyclictest.8: Group thread wakeup timing options cyclictest.8: Group SMP-related options cyclictest.8: Group memory options
cyclictest.8: Group thread priority options cyclictest.8: Group tracing options cyclictest.8: Group test duration options cyclictest.8: Group output options
cyclictest.8: Group x86 options
cyclictest.8: System options: Deprecate --laptop cyclictest.8: Options: Expand --default-system description cyclictest.8: Options: Reference clock_getres(2) cyclictest.8: Add example invocation cyclictest.8: Reference rtla-timerlat(1)

Costa Shulyupin (2):
rt-tests: hwlatdetect: Add timestamp delta
rt-tests: hwlatdetect: Add --time-format argument

John Kacur (13):
Makefile: Use relative symlinks for Python scripts
cyclictest: Simplify auxiliary clock parsing
rt-tests: README: Remove obsolete -n option from cyclictest examples
rt-tests: Add SPDX identifiers and fix documentation issues
rt-tests: Add AGENTS.md guide for AI coding assistants
pi_stress: Fix inconsistent barrier wait logic to prevent deadlock
pi_stress: Validate numeric command-line arguments
pi_stress: Improve error message for permission failures
pi_stress: Fix error and debug message formatting
pi_stress: Ensure null-termination of JSON filename
cyclicdeadline: Fix potential path truncation in open_cpuset()
rt-tests: rt-migrate-test: Report trace_marker write errno once and
stop
rt-tests: Create v2.11

Lukas Beckmann (1):
cyclictest: fix growing shm stat file

Sebastian Andrzej Siewior (4):
rt-tests: cyclicdeadline: Remove unused `alloverflows'
cyclictest: Acquire a lock before invoking pthread_cond_signal()
cyclictest: Make break_thread_id_lock a PI lock
cyclictest: Make trigger_lock a PI lock

Suneeth D (1):
cyclictest: Fix BUILD failure for GCC_VER < 14

Thomas Weißschuh (Schneider Electric) (6):
cyclictest: Centralize clock option parsing
cyclictest: Test the return value of timer_create()
cyclictest: Fix error error returns for uclibc clock_nanosleep()
fallback
cyclictest: Correctly print clock_nanosleep() errors
cyclictest: Allow symbolic clock names
cyclictest: Add support for auxiliary clocks

0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch refreshed for 2.11

---
 .../0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch | 5 +----
 meta/recipes-rt/rt-tests/rt-tests.inc                        | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)
meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +1 -4
index a39781908ec..3e006a75b19 100644
@@ -1,4 +1,4 @@
-From 7cf4cf097895bd4c3f3d3a6f783c766b3173cf1a Mon Sep 17 00:00:00 2001
+From ac0265695bc1cc70fbe06e6b0bfaf46a4c8f234d Mon Sep 17 00:00:00 2001
 From: Randy Witt <[email protected]>
 Date: Fri, 16 Oct 2020 16:54:30 -0700
 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden
@@ -28,6 +28,3 @@ index 83d2a33..e757839 100644
  
  OBJDIR = bld
  
--- 
-2.43.0
-
meta/recipes-rt/rt-tests/rt-tests.inc +2 -2
index e782d990c8a..a16e524d3fa 100644
@@ -1,5 +1,5 @@
-SRCREV = "40b14a2aac9449dfb07d4f9b4bd873fc3ea62f28"
-PV = "2.10"
+SRCREV = "62da2befac98f811af8e56f2b7992fb09faa33d6"
+PV = "2.11"
 PE = "1"
 
 SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=main;protocol=https;tag=v${PV}"