6.6: Fix For Fedora and OpenSuse (#840)

* Update 0013-fedora-rpm.patch

The patch  was using the syntax of the mkspec file instead of that of the kernel.spec, leading to the build failing.

* 6.6: Fix for Fedora and OpenSuse

* 6.6: Fix for OpenSuse

* Update 0013-fedora-rpm.patch to fix kernel-install issue on Fedora

Patch grabbed from https://lore.kernel.org/linux-kbuild/20231103-rpmpost-v1-1-9c18afab47f4@meta.com/

* Undo removing of kernel-uname-r

---------

Co-authored-by: Nanotwerp <Nanotwerp@gmail.com>
This commit is contained in:
Virtuoz-Ier
2023-11-14 09:32:10 +01:00
committed by GitHub
parent 7e07a8288d
commit df360952b9
3 changed files with 56 additions and 41 deletions

View File

@@ -280,40 +280,33 @@ index ac3f2ee6d..e96ffc9a7 100644
%if %{with_devel}
%package devel
Summary: Development package for building kernel modules to match the %{version} kernel
@@ -67,8 +80,8 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEA
@@ -67,7 +80,7 @@ cp $(%{make} %{makeflags} -s image_name) %{buildroot}/boot/vmlinuz-%{KERNELRELEA
%{make} %{makeflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
cp System.map %{buildroot}/boot/System.map-%{KERNELRELEASE}
cp .config %{buildroot}/boot/config-%{KERNELRELEASE}
-ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/build
-ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/lib/modules/%{KERNELRELEASE}/source
+ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/usr/lib/modules/%{KERNELRELEASE}/build
+ln -fns /usr/src/kernels/%{KERNELRELEASE} %{buildroot}/usr/lib/modules/%{KERNELRELEASE}/source
%if %{with_devel}
%{make} %{makeflags} run-command KBUILD_RUN_COMMAND='${srctree}/scripts/package/install-extmod-build %{buildroot}/usr/src/kernels/%{KERNELRELEASE}'
%endif
@@ -99,9 +112,9 @@ fi
@@ -99,8 +112,8 @@ fi
%files
%defattr (-, root, root)
-/lib/modules/%{KERNELRELEASE}
-%exclude /lib/modules/%{KERNELRELEASE}/build
-%exclude /lib/modules/%{KERNELRELEASE}/source
+/usr/lib/modules/%{KERNELRELEASE}
+%exclude /usr/lib/modules/%{KERNELRELEASE}/build
+%exclude /usr/lib/modules/%{KERNELRELEASE}/source
/boot/*
%files headers
@@ -112,6 +125,10 @@ fi
@@ -112,5 +125,8 @@ fi
%files devel
%defattr (-, root, root)
/usr/src/kernels/%{KERNELRELEASE}
-/lib/modules/%{KERNELRELEASE}/build
-/lib/modules/%{KERNELRELEASE}/source
+/usr/lib/modules/%{KERNELRELEASE}/build
+/usr/lib/modules/%{KERNELRELEASE}/source
%endif
+
+%files syms
+%defattr (-, root, root)
+/usr/src/kernels/$KERNELRELEASE/doc