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: #1
Co-authored-by: ebasov <eduard.basov@softline.com>
Co-committed-by: ebasov <eduard.basov@softline.com>

.gitignore

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

.kernel-ml.metadata

@@ -1 +1 @@
-b09d769f60d53ea3e598c1ac8c58a10bf1e63a3f  SOURCES/linux-6.6.1.tar.xz
+3cb9a1a5d0c53d6a5fc5cd9438a36330151b4e5f  SOURCES/linux-6.12.1.tar.xz

SOURCES/mod-sign.sh

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/bash -x
 
 # The modules_sign target checks for corresponding .o files for every .ko that
 # is signed. This doesn't work for package builds which re-use the same build
@@ -14,19 +14,15 @@ MODPUBKEY=$2
 moddir=$3
 
 modules=$(find "$moddir" -type f -name '*.ko')
+sign_file=$(find . -name 'sign-file')
 
 NPROC=$(nproc)
 [ -z "$NPROC" ] && NPROC=1
 
 # NB: this loop runs 2000+ iterations. Try to be fast.
-
-# Test
-echo "Current home is $(pwd)"
-find . -name 'sign-file'
-
 echo "$modules" | xargs -r -n16 -P $NPROC sh -c "
 for mod; do
-    ./scripts/sign-file sha256 $MODSECKEY $MODPUBKEY \$mod
+    $sign_file sha256 $MODSECKEY $MODPUBKEY \$mod
     rm -f \$mod.sig \$mod.dig
 done
 " DUMMYARG0   # xargs appends ARG1 ARG2..., which go into $mod in for loop.

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.6.1
+%global LKAver 6.12.1
 
 # Define the buildid, if required.
 #global buildid .local
@@ -246,7 +246,7 @@ Source2002: kvm_stat.logrotate
 %define secureboot_ca_0 %{_datadir}/pki/sb-certs/secureboot-ca-%{_arch}.cer
 %define secureboot_key_0 %{_datadir}/pki/sb-certs/secureboot-kernel-%{_arch}.cer
 
-%define pesign_name_0 redhatsecureboot501
+%define pesign_name_0 spheresecureboot001
 %endif
 
 %description
@@ -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.
@@ -613,7 +631,7 @@ cp config-%{version}-%{_target_cpu} .config
 %{__make} -s ARCH=%{bldarch} oldconfig
 
 %if %{signkernel} || %{signmodules}
-cp %{SOURCE23} certs/
+cp %{SOURCE23} certs/x509.genkey
 %endif
 
 %if %{with_std}
@@ -709,7 +727,7 @@ popd > /dev/null
 %define __modsign_install_post \
 if [ "%{signmodules}" -eq "1" ]; then \
 	if [ "%{with_std}" -ne "0" ]; then \
-		%{SOURCE21} certs/signing_key.pem.sign 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,7 +1512,23 @@ fi
 %kernel_ml_variant_files %{_use_vdso} %{with_std}
 
 %changelog
-* Sun Nov 12 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 6.6.1-1R.inferit
+* 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
+
+* Wed May  8 2024 Arkady L. Shane <ashejn@msvsphere.ru> - 6.8.9-1.inferit
+- Update to 6.8.9
+
+* Wed Dec 27 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 6.6.8-1.inferit
+- Update to 6.6.8
+
+* Sat Nov 25 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 6.6.2-1.inferit
+- Update to 6.6.2
+
+* Sun Nov 12 2023 Arkady L. Shane <ashejn@msvsphere.ru> - 6.6.1-1.inferit
 - Rebuilt for MSVSphere 9.2
 
 * Sun Nov 12 2023 Arkady L. Shane <tigro@msvsphere-os.ru> - 6.6.1-1.inferit