From: Jakub Bogusz Date: Sun, 10 May 2020 18:00:44 +0000 (+0200) Subject: - arm arch is a macro X-Git-Tag: auto/th/kernel-5.6.12-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=ecab658e3afca534082c034513b1119ef58eea5d;p=packages%2Fkernel.git - arm arch is a macro --- diff --git a/kernel.spec b/kernel.spec index 90301f72..d4f41d8f 100644 --- a/kernel.spec +++ b/kernel.spec @@ -41,7 +41,7 @@ %{?debug:%define with_verbose 1} %define have_drm 1 -%ifarch %{ix86} %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64 +%ifarch %{ix86} %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64 %define have_ide 1 %else %define have_ide 0 @@ -311,7 +311,7 @@ Conflicts: xfsprogs < 2.6.0 %if %{with pae} ExclusiveArch: i686 pentium3 pentium4 athlon %else -ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha arm ia64 ppc ppc64 sparc sparc64 aarch64 +ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} x32 alpha %{arm} ia64 ppc ppc64 sparc sparc64 aarch64 %endif ExclusiveOS: Linux BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -1014,7 +1014,7 @@ cp -aL %{objdir}/.config $RPM_BUILD_ROOT/boot/config-%{kernel_release} install -p %{objdir}/vmlinux.aout $RPM_BUILD_ROOT/boot/vmlinux.aout-%{kernel_release} %endif %endif -%ifarch arm +%ifarch %{arm} install -p %{objdir}/arch/arm/boot/zImage $RPM_BUILD_ROOT/boot/vmlinuz-%{kernel_release} %endif %ifarch aarch64