From f59fe9875440ce1a3da9c5d6281d5212b82cc2ef Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Mon, 3 Oct 2022 20:34:08 +0200 Subject: [PATCH] Fix RPM build with Linux 6.0 Thanks to @AdelKS and @ktheticdev Fixes https://github.com/Frogging-Family/linux-tkg/pull/613 --- linux-tkg-patches/6.0/0013-fedora-rpm.patch | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 linux-tkg-patches/6.0/0013-fedora-rpm.patch diff --git a/linux-tkg-patches/6.0/0013-fedora-rpm.patch b/linux-tkg-patches/6.0/0013-fedora-rpm.patch new file mode 100644 index 0000000..ca08792 --- /dev/null +++ b/linux-tkg-patches/6.0/0013-fedora-rpm.patch @@ -0,0 +1,26 @@ +# Remove the obsoletes line in kernel-headers +# Add provides for kernel-devel so there's no conflict + +diff --git a/scripts/package/mkspec b/scripts/package/mkspec +index 7c477ca7d..1158f5559 100755 +--- a/scripts/package/mkspec ++++ b/scripts/package/mkspec +@@ -25,0 +26 @@ fi ++PROVIDES_DRM="" +@@ -27 +28 @@ if grep -q CONFIG_DRM=y .config; then +- PROVIDES=kernel-drm ++ PROVIDES_DRM="Provides: kernel-drm = %{version}" +@@ -30 +30,0 @@ fi +-PROVIDES="$PROVIDES kernel-$KERNELRELEASE" +@@ -51 +51,3 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz +- Provides: $PROVIDES ++ $PROVIDES_DRM ++ Provides: kernel = %{version} ++ Provides: installonlypkg(kernel) = %{version} +@@ -61 +63 @@ $S Source: kernel-$__KERNELRELEASE.tar.gz +- Obsoletes: kernel-headers ++ Provides: installonlypkg(kernel) = %{version} +@@ -72,0 +75,3 @@ $S$M Group: System Environment/Kernel ++$S$M Provides: kernel-devel = %{version} ++$S$M Provides: kernel-devel-uname-r = %{version} ++$S$M Provides: installonlypkg(kernel) = %{version}