| Message ID | 20230722044806.3867434-5-masahiroy@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/19] kbuild: rpm-pkg: define _arch conditionally | expand |
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index a1ce6677880a..0befb4e2ac6b 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
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> --- scripts/package/mkspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)