pkg/fedora: Update Fedora-specific build patches

pkg/fedora/kernel-surface/patches/0001-iptsd.patch → pkg/fedora/kernel-surface/patches/0001-Pull-in-iptsd-as-a-weak-dependency.patch

@@ -1,4 +1,4 @@
-From 7edf2d0d7cb87dc6c1af96d6d5cb2b0c906261d6 Mon Sep 17 00:00:00 2001
+From a6efddbe9af597841afae20b6f046f96b5467609 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 10:33:03 +0200
 Subject: [PATCH 1/5] Pull in iptsd as a weak dependency
@@ -9,10 +9,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 1 insertion(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index c0201430e851..a24eae4e25e4 100644
+index 7cc72d5a5c77..c11232e74d15 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1043,6 +1043,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1140,6 +1140,7 @@ Requires(pre): %{kernel_prereq}\
  Requires(pre): %{initrd_prereq}\
  Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
  Recommends: linux-firmware\
@@ -21,5 +21,5 @@ index c0201430e851..a24eae4e25e4 100644
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
 -- 
-2.47.0
+2.50.0
 

pkg/fedora/kernel-surface/patches/0002-provides.patch → pkg/fedora/kernel-surface/patches/0002-Let-kernel-surface-provide-the-standard-package-name.patch

@@ -1,4 +1,4 @@
-From 41770a97d1ea6e590697a6c3319b2d39581eab4d Mon Sep 17 00:00:00 2001
+From 1d878cc13b3d4d5d50ad58b9a871ad2202a9c7ec Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 10:34:38 +0200
 Subject: [PATCH 2/5] Let kernel-surface provide the standard package names
@@ -9,18 +9,18 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 5 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index a24eae4e25e4..3b6c46b930e7 100644
+index c11232e74d15..ca6517bdc945 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -665,6 +665,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
- Requires: kernel-modules-uname-r = %{KVERREL}
+@@ -723,6 +723,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}
  Requires: kernel-modules-core-uname-r = %{KVERREL}
+ Requires: ((kernel-modules-extra-uname-r = %{KVERREL}) if kernel-modules-extra-matched)
  Provides: installonlypkg(kernel)
 +Provides: kernel = %{KVERREL}
  %endif
  
  
-@@ -1375,6 +1376,7 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
+@@ -1440,6 +1441,7 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
  Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{specrpmversion}-%{release}\
  Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
  Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
@@ -28,7 +28,7 @@ index a24eae4e25e4..3b6c46b930e7 100644
  Provides: installonlypkg(kernel)\
  AutoReqProv: no\
  Requires(pre): findutils\
-@@ -1404,6 +1406,7 @@ against the %{?2:%{2} }kernel package.\
+@@ -1469,6 +1471,7 @@ against the %{?2:%{2} }kernel package.\
  Summary: Meta package to install matching core and devel packages for a given %{?2:%{2} }kernel\
  Requires: %{package_name}%{?1:-%{1}}-devel = %{specrpmversion}-%{release}\
  Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
@@ -36,7 +36,7 @@ index a24eae4e25e4..3b6c46b930e7 100644
  %description %{?1:%{1}-}devel-matched\
  This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
  %{nil}
-@@ -1525,6 +1528,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
+@@ -1586,6 +1589,7 @@ Requires: ((kernel-%{1}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{1}})
  Requires: realtime-setup\
  %endif\
  Provides: installonlypkg(kernel)\
@@ -44,7 +44,7 @@ index a24eae4e25e4..3b6c46b930e7 100644
  %description %{1}\
  The meta-package for the %{1} kernel\
  %{nil}
-@@ -1558,6 +1562,7 @@ This package provides KVM modules for package kernel%{?1:-%{1}}.\
+@@ -1600,6 +1604,7 @@ The meta-package for the %{1} kernel\
  Summary: %{variant_summary}\
  Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Provides: installonlypkg(kernel)\
@@ -53,5 +53,5 @@ index a24eae4e25e4..3b6c46b930e7 100644
  Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
 -- 
-2.47.0
+2.50.0
 

pkg/fedora/kernel-surface/patches/0003-obsoletes.patch → pkg/fedora/kernel-surface/patches/0003-Let-kernel-surface-conflict-with-older-versions-of-t.patch

@@ -1,4 +1,4 @@
-From 4da3688eddb23be31b8560e6c437fd7fe86ad809 Mon Sep 17 00:00:00 2001
+From cb7cebc53abc4152d3db1e3e53b069792dd3171e Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 10:40:32 +0200
 Subject: [PATCH 3/5] Let kernel-surface conflict with older versions of the
@@ -6,15 +6,15 @@ Subject: [PATCH 3/5] Let kernel-surface conflict with older versions of the
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- redhat/kernel.spec.template | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
+ redhat/kernel.spec.template | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index 3b6c46b930e7..3b44b904b025 100644
+index ca6517bdc945..2be57434622c 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -666,6 +666,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
- Requires: kernel-modules-core-uname-r = %{KVERREL}
+@@ -724,6 +724,10 @@ Requires: kernel-modules-core-uname-r = %{KVERREL}
+ Requires: ((kernel-modules-extra-uname-r = %{KVERREL}) if kernel-modules-extra-matched)
  Provides: installonlypkg(kernel)
  Provides: kernel = %{KVERREL}
 +
@@ -24,7 +24,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  %endif
  
  
-@@ -1378,6 +1382,8 @@ Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suff
+@@ -1443,6 +1447,8 @@ Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suff
  Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Provides: kernel-devel = %{KVERREL}%{?1:+%{1}}\
  Provides: installonlypkg(kernel)\
@@ -33,7 +33,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  AutoReqProv: no\
  Requires(pre): findutils\
  Requires: findutils\
-@@ -1407,6 +1413,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
+@@ -1472,6 +1478,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
  Requires: %{package_name}%{?1:-%{1}}-devel = %{specrpmversion}-%{release}\
  Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
  Provides: kernel-devel-matched = %{specrpmversion}-%{release}\
@@ -42,16 +42,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  %description %{?1:%{1}-}devel-matched\
  This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
  %{nil}
-@@ -1439,6 +1447,8 @@ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix
- Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
- Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
- Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
-+Conflicts: %{package_name}-modules-internal < 6.3.7-2\
-+Obsoletes: %{package_name}-modules-internal < 6.3.7-2\
- AutoReq: no\
- AutoProv: yes\
- %description %{?1:%{1}-}modules-internal\
-@@ -1460,6 +1470,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?
+@@ -1520,6 +1528,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?
  Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
@@ -60,7 +51,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1483,6 +1495,8 @@ Provides: installonlypkg(kernel-module)\
+@@ -1543,6 +1553,8 @@ Provides: installonlypkg(kernel-module)\
  Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
@@ -69,7 +60,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1505,6 +1519,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:
+@@ -1565,6 +1577,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:
  Provides: installonlypkg(kernel-module)\
  Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
@@ -78,8 +69,8 @@ index 3b6c46b930e7..3b44b904b025 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1527,6 +1543,8 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
- %if "%{1}" == "rt" || "%{1}" == "rt-debug"\
+@@ -1588,6 +1602,8 @@ Requires: ((kernel-%{1}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{1}})
+ %if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\
  Requires: realtime-setup\
  %endif\
 +Conflicts: %{package_name} < 6.3.7-2\
@@ -87,7 +78,7 @@ index 3b6c46b930e7..3b44b904b025 100644
  Provides: installonlypkg(kernel)\
  Provides: kernel = %{KVERREL}+%{1}\
  %description %{1}\
-@@ -1563,6 +1581,8 @@ Summary: %{variant_summary}\
+@@ -1605,6 +1621,8 @@ Summary: %{variant_summary}\
  Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Provides: installonlypkg(kernel)\
  Provides: kernel-%{?1:%{1}-}core = %{KVERREL}%{?1:+%{1}}\
@@ -97,5 +88,5 @@ index 3b6c46b930e7..3b44b904b025 100644
  Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
 -- 
-2.47.0
+2.50.0
 

pkg/fedora/kernel-surface/patches/0004-default-kernel.patch → pkg/fedora/kernel-surface/patches/0004-Install-scripts-and-service-files-for-keeping-the-su.patch

@@ -1,4 +1,4 @@
-From e4184318977732138664afe43f9e1083ed530dc3 Mon Sep 17 00:00:00 2001
+From 9254dd83c5727f0ee761af26bc36edd2f1921010 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 10:41:11 +0200
 Subject: [PATCH 4/5] Install scripts and service files for keeping the surface
@@ -10,10 +10,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 33 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index 3b44b904b025..d4adb18e6024 100644
+index 2be57434622c..e62247d054aa 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1016,6 +1016,11 @@ Source4000: README.rst
+@@ -1113,6 +1113,11 @@ Source4000: README.rst
  Source4001: rpminspect.yaml
  Source4002: gating.yaml
  
@@ -25,7 +25,7 @@ index 3b44b904b025..d4adb18e6024 100644
  ## Patches needed for building this package
  
  %if !%{nopatches}
-@@ -1049,6 +1054,7 @@ Requires(pre): %{initrd_prereq}\
+@@ -1146,6 +1151,7 @@ Requires(pre): %{initrd_prereq}\
  Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
  Recommends: linux-firmware\
  Recommends: iptsd\
@@ -33,7 +33,7 @@ index 3b44b904b025..d4adb18e6024 100644
  Requires(preun): systemd >= 200\
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
-@@ -1063,6 +1069,13 @@ AutoProv: yes\
+@@ -1160,6 +1166,13 @@ AutoProv: yes\
  %{nil}
  
  
@@ -47,7 +47,7 @@ index 3b44b904b025..d4adb18e6024 100644
  %package doc
  Summary: Various documentation bits found in the kernel source
  Group: Documentation
-@@ -3242,6 +3255,11 @@ find Documentation -type d | xargs chmod u+w
+@@ -3366,6 +3379,11 @@ find Documentation -type d | xargs chmod u+w
  
  cd linux-%{KVERREL}
  
@@ -59,7 +59,7 @@ index 3b44b904b025..d4adb18e6024 100644
  # re-define RPM_VMLINUX_H, because it doesn't carry over from %build
  RPM_VMLINUX_H="$(cat ../vmlinux_h_path)"
  
-@@ -3513,6 +3531,15 @@ popd
+@@ -3651,6 +3669,15 @@ popd
  ### scripts
  ###
  
@@ -75,7 +75,7 @@ index 3b44b904b025..d4adb18e6024 100644
  %if %{with_tools}
  %post -n %{package_name}-tools-libs
  /sbin/ldconfig
-@@ -3980,6 +4007,12 @@ fi\
+@@ -4118,6 +4145,12 @@ fi\
  %{_libexecdir}/kselftests
  %endif
  
@@ -89,5 +89,5 @@ index 3b44b904b025..d4adb18e6024 100644
  %if %{with_up_base}
  %ifnarch %nobuildarches noarch
 -- 
-2.47.0
+2.50.0
 

pkg/fedora/kernel-surface/patches/0005-ipu3-fw.patch → pkg/fedora/kernel-surface/patches/0005-Pull-in-intel-vsc-firmware.patch

@@ -1,4 +1,4 @@
-From 051436f2db94eea7b56a3bf993915b8cc16481f4 Mon Sep 17 00:00:00 2001
+From 53705991e1729c45d4f67442f4f960fac6cbe6fe Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Mon, 29 Jan 2024 19:26:41 +0100
 Subject: [PATCH 5/5] Pull in intel-vsc-firmware
@@ -9,10 +9,10 @@ This package contains the IPU3 firmware needed for camera support.
  1 file changed, 1 insertion(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index d4adb18e6024..f236b4807592 100644
+index e62247d054aa..2a649e791854 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1053,6 +1053,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1150,6 +1150,7 @@ Requires(pre): %{kernel_prereq}\
  Requires(pre): %{initrd_prereq}\
  Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\
  Recommends: linux-firmware\
@@ -21,5 +21,5 @@ index d4adb18e6024..f236b4807592 100644
  Recommends: %{package_name}-default-watchdog\
  Requires(preun): systemd >= 200\
 -- 
-2.47.0
+2.50.0