From 3fc3c79810b53ab6856c8b94c6ccc1d94504290c Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 6 Jan 2024 01:25:27 +0100
Subject: [PATCH] update to 5.15.85 headers: fix x86 external modules build by
 installing arch/x86/Makefile_32.cpu (and other build files from this dir)
 [release 5.15.85-1mamba;Sat Dec 24 2022]

---
 kernel.spec | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/kernel.spec b/kernel.spec
index 0527bf1..66f74c0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1,10 +1,6 @@
 # openmamba kernel specfile
-# Copyright (C) 2004-2022 by Silvan Calarco
-# Copyright (C) 2004-2006 by Davide Madrisan
-# released under the GPL version 3 license
 #
 # To build a specific target:
-#
 # rpmbuild -ba --define="KERNEL_TARGET <target>" kernel.spec
 #
 # To cross-compile:
@@ -99,7 +95,7 @@
 %define _use_internal_dependency_generator 1
 
 Name:          kernel
-Version:       5.15.74
+Version:       5.15.85
 Release:       1mamba
 Summary:       The Linux Kernel, the operating system core itself
 Group:         System/Kernel and Hardware
@@ -120,7 +116,6 @@ URL:           https://www.kernel.org/
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libelf-devel
 BuildRequires: libopenssl-devel
 BuildRequires: libperl
 BuildRequires: libyaml-devel
@@ -190,6 +185,9 @@ Provides:      kernelsanitisedheaders = %{version}
 Sanitised kernel headers used for glibc build.
 This kernel sanitised headers are configured for %{TARGET_CPU} architecture and the following target: %{?KERNEL_TARGET}.
 
+# Don't clean build at the end
+%global __spec_rmbuild_cmd /bin/true
+
 %prep
 [  "%{buildroot}" != / ] && rm -rf "%{buildroot}"
 
@@ -368,7 +366,7 @@ build_dir=%{buildroot}%{_prefix}/src/linux-%{kernel_ver}%{KERNEL_LOCALVER}
 
 install -Dt ${build_dir} -m644 .config Makefile Module.symvers System.map localversion.* version
 install -Dt ${build_dir}/kernel -m644 kernel/Makefile
-install -Dt ${build_dir}/arch/${headers_arch} -m644 arch/${headers_arch}/Makefile
+install -Dt ${build_dir}/arch/${headers_arch} -m644 arch/${headers_arch}/Makefile* arch/${headers_arch}/Kbuild
 cp -t ${build_dir} -a scripts
 
 # add objtool for external module building and enabled VALIDATION_STACK option
@@ -591,6 +589,10 @@ fi
 /lib/modules/%{kernel_ver}%{?KERNEL_LOCALVER}/build
 
 %changelog
+* Sat Dec 24 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.85-1mamba
+- update to 5.15.85
+- headers: fix x86 external modules build by installing arch/x86/Makefile_32.cpu (and other build files from this dir)
+
 * Sat Oct 22 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 5.15.74-1mamba
 - update to 5.15.74