diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index 469a079..9f3cc99 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -53,21 +53,21 @@ # Architectures upon which we can sign the kernel # for secure boot authentication. -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %global signkernel 1 %else %global signkernel 0 %endif # Sign modules on all architectures that build modules. -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %global signmodules 1 %else %global signmodules 0 %endif # Compress modules on all architectures that build modules. -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %global zipmodules 1 %else %global zipmodules 0 @@ -129,7 +129,7 @@ %define with_vdso_install 0 %endif -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %define with_doc 0 %endif @@ -185,7 +185,7 @@ BuildRequires: gzip, hmaccalc, hostname, kernel-rpm-macros >= 185-9, kmod, m4, m BuildRequires: patch, perl-Carp, perl-devel, perl-generators, perl-interpreter, python3-devel BuildRequires: redhat-rpm-config, tar, which, xz -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 BuildRequires: bpftool, openssl-devel %endif @@ -555,7 +555,7 @@ Package contains the Linux kernel with KMEMLEAK support. %global make %{__make} -s HOSTCFLAGS="%{?build_cflags}" HOSTLDFLAGS="%{?build_ldflags}" %prep -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %if %{with_baseonly} %if !%{with_std} echo "Cannot build --with baseonly as the standard build is currently disabled." @@ -609,7 +609,7 @@ cp %{SOURCE10} config-%{version}-x86_64-kmemleak.config cd .. -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 # Set the EXTRAVERSION string in the top level Makefile. sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile @@ -706,7 +706,7 @@ BuildKernel() { InstallName=${5:-vmlinuz} DoModules=1 - %ifarch x86_64 || aarch64 || noarch + %ifarch x86_64 aarch64 noarch DoModules=0 %endif @@ -727,7 +727,7 @@ BuildKernel() { pushd ../linux-%{KVERREL}${Variant:+-${Variant}} pwd > ../kernel${Variant:+-${Variant}}.list - %ifarch x86_64 || aarch64 + %ifarch x86_64 aarch64 cp configs/config-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config .config %{__make} -s ARCH=%{bldarch} oldconfig @@ -759,7 +759,7 @@ BuildKernel() { %endif %endif - %ifarch x86_64 || aarch64 + %ifarch x86_64 aarch64 mkdir -p $RPM_BUILD_ROOT %if %{with_std} @@ -1193,7 +1193,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso} kmsan BuildKernel %make_target %kernel_image %{_use_vdso} kmemleak %endif -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 BuildKernel %make_target %kernel_image %{_use_vdso} %endif @@ -1648,7 +1648,7 @@ fi %endif # Empty meta-package. -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %files %endif @@ -1704,7 +1704,7 @@ fi %endif\ %{nil} -%ifarch x86_64 || aarch64 +%ifarch x86_64 aarch64 %kernel_lt_variant_files %{_use_vdso} %{with_std} %endif