diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2023-07-22 06:47:48 +0200 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2023-07-24 17:59:32 +0200 |
| commit | 233046a2afd12a4f699305b92ee634eebf1e4f31 (patch) | |
| tree | 2651c9838df8b44263c96c485de61c2327f4f7aa /scripts | |
| parent | Revert "kbuild: Hack for depmod not handling X.Y versions" (diff) | |
| download | linux-233046a2afd12a4f699305b92ee634eebf1e4f31.tar.xz linux-233046a2afd12a4f699305b92ee634eebf1e4f31.zip | |
kbuild: rpm-pkg: define _arch conditionally
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>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/mkspec | 2 |
1 files changed, 1 insertions, 1 deletions
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} |