diff --git a/SPECS/kernel-6.1.spec b/SPECS/kernel-6.1.spec index 2bceab6..10d3fda 100644 --- a/SPECS/kernel-6.1.spec +++ b/SPECS/kernel-6.1.spec @@ -269,7 +269,6 @@ BuildConflicts: rhbuildsys(DiskFree) < 500Mb ### Source0: https://git.linuxtesting.ru/pub/scm/linux/kernel/git/lvc/linux-stable.git/snapshot/linux-stable-%{LKAver}-%{lvc}.tar.gz -Source2: config-%{version}-x86_64 Source4: config-%{version}-aarch64 Source8: config-%{version}-x86_64-kmsan @@ -557,14 +556,6 @@ Requires: %{name}-core-uname-r = %{KVERREL}\ # And, finally, the main -core package. -%define variant_summary The Linux kernel. -%kernel_lt_variant_package -%description core -The %{name} package contains the Linux kernel (vmlinuz), the core of any -Linux kernel based operating system. The %{name} package handles the basic -functions of the operating system: memory allocation, process allocation, -device input and output, etc. - %ifarch x86_64 %define variant_summary The Linux kernel. %kernel_lt_variant_package kmsan @@ -629,7 +620,6 @@ fi mkdir configs cd configs -cp %{SOURCE2} config-%{version}-x86_64.config cp %{SOURCE4} config-%{version}-aarch64.config cp %{SOURCE8} config-%{version}-x86_64-kmsan.config @@ -642,7 +632,6 @@ sed -i "s@^EXTRAVERSION.*@EXTRAVERSION = -%{release}.%{_target_cpu}@" Makefile %ifarch x86_64 declare -a config_files=( - "configs/config-%{version}-x86_64.config" "configs/config-%{version}-x86_64-kmsan.config" ) %endif @@ -1229,7 +1218,7 @@ cd linux-%{KVERREL} BuildKernel %make_target %kernel_image %{_use_vdso} kmsan %endif -%ifarch x86_64 aarch64 +%ifarch aarch64 BuildKernel %make_target %kernel_image %{_use_vdso} %endif @@ -1566,8 +1555,10 @@ then\ fi\ %{nil} +%ifarch aarch64 %kernel_lt_variant_preun %kernel_lt_variant_post -r kernel-smp +%endif %ifarch x86_64 %kernel_lt_variant_preun kmsan @@ -1727,7 +1718,7 @@ fi %endif\ %{nil} -%ifarch x86_64 aarch64 +%ifarch aarch64 %kernel_lt_variant_files %{_use_vdso} %{with_std} %endif