From: Masahiro Yamada <masahiroy@kernel.org>
Date: Sat, 22 Jul 2023 04:47:52 +0000 (+0900)
Subject: kbuild: rpm-pkg: record ARCH option in spec file
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a06d9ef897d59f719102e2890abd8a2b91e29a60;p=linux.git

kbuild: rpm-pkg: record ARCH option in spec file

Currently, we rely on the top Makefile defining ARCH option when we
run 'make rpm-pkg' or 'make binrpm-pkg'.

It does not apply when we run 'make srcrpm-pkg', and separately run
'rpmbuild' for the generated SRPM. This is a problem for cross-build.

Just like the Debian package, save the value of ARCH in the spec file.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index a1ce6677880ab..0befb4e2ac6b7 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -38,8 +38,10 @@ EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \
 #  $S: this line is enabled only when building source package
 #  $M: this line is enabled only when CONFIG_MODULES is enabled
 sed -e '/^DEL/d' -e 's/^\t*//' <<EOF
+%define ARCH ${ARCH}
+
 %{!?make: %define make make}
-%define makeflags %{?_smp_mflags}
+%define makeflags %{?_smp_mflags} ARCH=%{ARCH}
 
 	Name: kernel
 	Summary: The Linux Kernel