Fixing a bug-ridden build for aarch64( Added %{_build_arch} )

https://elrepo.org/linux/kernel/el9/SRPMS/

Updating the kernel version to 6.12.1

Reviewed-on: rpms/kernel-ml#1
Co-authored-by: ebasov <eduard.basov@softline.com>
Co-committed-by: ebasov <eduard.basov@softline.com>

.gitignore

@@ -1 +1 @@
-SOURCES/linux-6.10.4.tar.xz
+SOURCES/linux-6.12.1.tar.xz

.kernel-ml.metadata

@@ -1 +1 @@
-b0a7bdfc9b1d2398a011daab1091f88c18df1864  SOURCES/linux-6.10.4.tar.xz
+3cb9a1a5d0c53d6a5fc5cd9438a36330151b4e5f  SOURCES/linux-6.12.1.tar.xz

SPECS/kernel-ml-6.12.spec

@@ -24,7 +24,7 @@
 %global _binary_payload w3T.xzdio
 
 # Define the version of the Linux Kernel Archive tarball.
-%global LKAver 6.10.4
+%global LKAver 6.12.1
 
 # Define the buildid, if required.
 #global buildid .local
@@ -333,6 +333,12 @@ Obsoletes: cpufrequtils < 1:009-0.6.p1
 Provides:  cpufrequtils = 1:009-0.6.p1
 Obsoletes: cpuspeed < 1:1.5-16
 Requires: %{name}-tools-libs = %{version}-%{release}
+%if "%{name}" == "kernel-ml"
+Conflicts: kernel-lt-tools
+%else
+# it's kernel-lt
+Conflicts: kernel-ml-tools
+%endif
 %define __requires_exclude ^%{_bindir}/python
 %description -n %{name}-tools
 This package contains the tools/ directory from the Linux kernel
@@ -343,6 +349,12 @@ Summary: Libraries for the %{name}-tools.
 License: GPLv2
 Obsoletes: kernel-tools-libs < %{version}
 Provides:  kernel-tools-libs = %{version}-%{release}
+%if "%{name}" == "kernel-ml"
+Conflicts: kernel-lt-tools-libs
+%else
+# it's kernel-lt
+Conflicts: kernel-ml-tools-libs
+%endif
 %description -n %{name}-tools-libs
 This package contains the libraries built from the tools/ directory
 of the Linux kernel source.
@@ -357,6 +369,12 @@ Provides:  cpupowerutils-devel = 1:009-0.6.p1
 Provides: %{name}-tools-devel
 Requires: %{name}-tools-libs = %{version}-%{release}
 Requires: %{name}-tools = %{version}-%{release}
+%if "%{name}" == "kernel-ml"
+Conflicts: kernel-lt-tools-libs-devel
+%else
+# it's kernel-lt
+Conflicts: kernel-ml-tools-libs-devel
+%endif
 %description -n %{name}-tools-libs-devel
 This package contains the development files for the tools/ directory
 of the Linux kernel source.
@@ -709,7 +727,7 @@ popd > /dev/null
 %define __modsign_install_post \
 if [ "%{signmodules}" -eq "1" ]; then \
 	if [ "%{with_std}" -ne "0" ]; then \
-		%{SOURCE21} linux-%{version}-%{release}.x86_64/certs/signing_key.pem.sign linux-%{version}-%{release}.x86_64/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
+		%{SOURCE21} linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.pem.sign linux-%{version}-%{release}.%{_build_arch}/certs/signing_key.x509.sign $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/ \
 	fi \
 fi \
 if [ "%{zipmodules}" -eq "1" ]; then \
@@ -861,7 +879,7 @@ cp -a --parents tools/include/tools/le_byteshift.h $RPM_BUILD_ROOT/lib/modules/%
 cp -a --parents tools/include/linux/compiler* $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
 cp -a --parents tools/include/linux/types.h $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
 cp -a --parents tools/build/Build.include $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
-cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
+# cp --parents tools/build/Build $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
 cp --parents tools/build/fixdep.c $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
 cp --parents tools/objtool/sync-check.sh $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
 cp -a --parents tools/bpf/resolve_btfids $RPM_BUILD_ROOT/lib/modules/%{KVERREL}/build
@@ -1494,6 +1512,10 @@ fi
 %kernel_ml_variant_files %{_use_vdso} %{with_std}
 
 %changelog
+* Tue Dec 3 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 6.12.1-1.inferit
+- Rebuild for MSVSphere 9.5
+- Update to 6.12.1
+
 * Mon Aug 12 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.10.4-1.inferit
 - Update to 6.10.4