diff mbox series

[01/19] kbuild: rpm-pkg: define _arch conditionally

Message ID	20230722044806.3867434-1-masahiroy@kernel.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada <masahiroy@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu> Subject: [PATCH 01/19] kbuild: rpm-pkg: define _arch conditionally Date: Sat, 22 Jul 2023 13:47:48 +0900 Message-Id: <20230722044806.3867434-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[01/19] kbuild: rpm-pkg: define _arch conditionally \| [01/19] kbuild: rpm-pkg: define _arch conditionally [02/19] kbuild: rpm-pkg: remove unneeded '-f $srctree/Makefile' in spec file [03/19] kbuild: rpm-pkg: do not hard-code $MAKE in spec file [04/19] kbuild: rpm-pkg: use %{makeflags} to pass common Make options [05/19] kbuild: rpm-pkg: record ARCH option in spec file [06/19] kbuild: rpm-pkg: replace $__KERNELRELEASE in spec file with %{version} [07/19] kbuild: rpm-pkg: replace $KERNELRELEASE in spec file with %{KERNELRELEASE} [08/19] kbuild: add a phony target to run a command with Kbuild env vars [09/19] kbuild: refactor kernel-devel RPM package and linux-headers Deb package [10/19] kbuild: rpm-pkg: derive the Version from %{KERNELRELEASE} [11/19] kbuild: rpm-pkg: use a dummy string for _arch when undefined [12/19] kbuild: rpm-pkg: invoke the kernel build from rpmbuild for binrpm-pkg [13/19] kbuild: rpm-pkg: run modules_install for non-modular kernel [14/19] kbuild: rpm-pkg: introduce %{with_devel} switch to select devel package [15/19] kbuild: rpm-pkg: split out the body of spec file [16/19] kbuild: rpm-pkg: rename binkernel.spec to kernel.spec [17/19] kbuild: rpm-pkg: build the kernel in-place for rpm-pkg [18/19] kbuild: rpm-pkg: refactor *rpm-pkg targets [19/19] kbuild: rpm-pkg: skip build dependency check on non-rpm systems

Commit Message

Masahiro Yamada July 22, 2023, 4:47 a.m. UTC

  Commit 3089b2be0cce ("kbuild: rpm-pkg: fix build error when _arch is
undefined") does not work as intended; _arch is always defined as
$UTS_MACHINE.

The intention was to define _arch to $UTS_MACHINE only when it is not
defined.

Fixes: 3089b2be0cce ("kbuild: rpm-pkg: fix build error when _arch is undefined")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 scripts/package/mkspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index 8049f0e2c110..c9299f9c1f3e 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -57,7 +57,7 @@  $S	BuildRequires: gcc make openssl openssl-devel perl python3 rsync
 
 	# $UTS_MACHINE as a fallback of _arch in case
 	# /usr/lib/rpm/platform/*/macros was not included.
-	%define _arch %{?_arch:$UTS_MACHINE}
+	%{!?_arch: %define _arch $UTS_MACHINE}
 	%define __spec_install_post /usr/lib/rpm/brp-compress || :
 	%define debug_package %{nil}