[1/2] linux-custom: Drop redundant setting of CROSS_COMPILE

Message ID fb54ef19d4c385a226f583866856eb021cc70bd9.1730114004.git.jan.kiszka@siemens.com
State Accepted, archived
Headers show
Series linux-custom: Enable compat vDSO support for arm64, clean up rules | expand

Commit Message

Jan Kiszka Oct. 28, 2024, 11:13 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

Since ac2bbd7ca249, we set CROSS_COMPILE in isar/common[.tmpl] if
needed. As this is run before every target, we can drop initialization
in the rules file.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 meta/recipes-kernel/linux/files/debian/isar/common.tmpl | 2 +-
 meta/recipes-kernel/linux/files/debian/rules.tmpl       | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

Patch

diff --git a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
index def8480e..5ba11289 100644
--- a/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/isar/common.tmpl
@@ -51,7 +51,7 @@  main() {
     done
 
     # variables to be exported
-    export ARCH
+    export ARCH CROSS_COMPILE
 
     # are we cross-compiling?
     BUILD_ARCH=$(dpkg-architecture -qDEB_BUILD_ARCH)
diff --git a/meta/recipes-kernel/linux/files/debian/rules.tmpl b/meta/recipes-kernel/linux/files/debian/rules.tmpl
index e8ae3daa..598ae93f 100755
--- a/meta/recipes-kernel/linux/files/debian/rules.tmpl
+++ b/meta/recipes-kernel/linux/files/debian/rules.tmpl
@@ -1,7 +1,5 @@ 
 #!/usr/bin/make -f
 
-CROSS_COMPILE:=$(DEB_HOST_GNU_TYPE)-
-
 MAINTAINER := $(shell sed -ne 's,^Maintainer: .[^<]*<\([^>]*\)>,\1,p' debian/control)
 DISTRIBUTOR := ${DISTRIBUTOR}
 SOURCE_DATE := $(shell dpkg-parsechangelog -SDate)
@@ -13,7 +11,6 @@  deb_top_dir:=$(S)/debian
 
 # Dynamic variables to be passed to Isar build scripts
 isar_env=$(strip \
-	export CROSS_COMPILE='$(CROSS_COMPILE)' && \
 	export DEB_BUILD_PROFILES='$(DEB_BUILD_PROFILES)' && \
 	export DEB_HOST_GNU_TYPE='$(DEB_HOST_GNU_TYPE)' && \
 	export MAKE='$(MAKE)' && \