pkg/fedora: Update packaging patches

pkg/fedora/kernel-surface/patches/0001-iptsd.patch

@@ -1,7 +1,7 @@
-From 1cad947df5f2ec874863e42cce595a76dad64cc2 Mon Sep 17 00:00:00 2001
+From bd92f2ec163acc3a109e2fd34793553e4038b4d6 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] Pull in iptsd as a weak dependency
+Subject: [PATCH 1/5] Pull in iptsd as a weak dependency
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
@@ -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 d3dafe56aa64..24823cd8b784 100644
+index c987db5886f2..1dbc56b1be3b 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1052,6 +1052,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1001,6 +1001,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 d3dafe56aa64..24823cd8b784 100644
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
 -- 
-2.41.0
+2.45.1
 

pkg/fedora/kernel-surface/patches/0002-provides.patch

@@ -1,7 +1,7 @@
-From 17907fed744ae17414a1ad8bebc335e12dac7691 Mon Sep 17 00:00:00 2001
+From 6e967041622e39df2ce421e8dcdc4aed67e8348d 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] Let kernel-surface provide the standard package names
+Subject: [PATCH 2/5] Let kernel-surface provide the standard package names
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
@@ -9,10 +9,10 @@ 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 24823cd8b784..ea7de5884a89 100644
+index 1dbc56b1be3b..98995c878ea8 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -697,6 +697,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
+@@ -653,6 +653,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
  Requires: kernel-modules-uname-r = %{KVERREL}
  Requires: kernel-modules-core-uname-r = %{KVERREL}
  Provides: installonlypkg(kernel)
@@ -20,7 +20,7 @@ index 24823cd8b784..ea7de5884a89 100644
  %endif
  
  
-@@ -1352,6 +1353,7 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
+@@ -1333,6 +1334,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 24823cd8b784..ea7de5884a89 100644
  Provides: installonlypkg(kernel)\
  AutoReqProv: no\
  Requires(pre): findutils\
-@@ -1381,6 +1383,7 @@ against the %{?2:%{2} }kernel package.\
+@@ -1362,6 +1364,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 24823cd8b784..ea7de5884a89 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}
-@@ -1502,6 +1505,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
+@@ -1483,6 +1486,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
  Requires: realtime-setup\
  %endif\
  Provides: installonlypkg(kernel)\
@@ -44,7 +44,7 @@ index 24823cd8b784..ea7de5884a89 100644
  %description %{1}\
  The meta-package for the %{1} kernel\
  %{nil}
-@@ -1534,6 +1538,7 @@ This package provides KVM modules for package kernel%{?1:-%{1}}.\
+@@ -1516,6 +1520,7 @@ This package provides KVM modules for package kernel%{?1:-%{1}}.\
  Summary: %{variant_summary}\
  Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
  Provides: installonlypkg(kernel)\
@@ -53,5 +53,5 @@ index 24823cd8b784..ea7de5884a89 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.41.0
+2.45.1
 

pkg/fedora/kernel-surface/patches/0003-obsoletes.patch

@@ -1,7 +1,7 @@
-From 819c1b06089925d6944bf2dad9dc29649b7510d5 Mon Sep 17 00:00:00 2001
+From 1ff16b22002a0c7f76f74042e07d8c44d2fe3db7 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] Let kernel-surface conflict with older versions of the
+Subject: [PATCH 3/5] Let kernel-surface conflict with older versions of the
  package
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
@@ -10,10 +10,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 20 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index ea7de5884a89..43dce82a9d36 100644
+index 98995c878ea8..4f3253f17121 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -698,6 +698,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
+@@ -654,6 +654,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
  Requires: kernel-modules-core-uname-r = %{KVERREL}
  Provides: installonlypkg(kernel)
  Provides: kernel = %{KVERREL}
@@ -24,7 +24,7 @@ index ea7de5884a89..43dce82a9d36 100644
  %endif
  
  
-@@ -1355,6 +1359,8 @@ Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suff
+@@ -1336,6 +1340,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 ea7de5884a89..43dce82a9d36 100644
  AutoReqProv: no\
  Requires(pre): findutils\
  Requires: findutils\
-@@ -1384,6 +1390,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
+@@ -1365,6 +1371,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,7 +42,7 @@ index ea7de5884a89..43dce82a9d36 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}
-@@ -1416,6 +1424,8 @@ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix
+@@ -1397,6 +1405,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}}}\
@@ -51,7 +51,7 @@ index ea7de5884a89..43dce82a9d36 100644
  AutoReq: no\
  AutoProv: yes\
  %description %{?1:%{1}-}modules-internal\
-@@ -1437,6 +1447,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?
+@@ -1418,6 +1428,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 +60,7 @@ index ea7de5884a89..43dce82a9d36 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1460,6 +1472,8 @@ Provides: installonlypkg(kernel-module)\
+@@ -1441,6 +1453,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 +69,7 @@ index ea7de5884a89..43dce82a9d36 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1482,6 +1496,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:
+@@ -1463,6 +1477,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,7 +78,7 @@ index ea7de5884a89..43dce82a9d36 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1504,6 +1520,8 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
+@@ -1485,6 +1501,8 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
  %if "%{1}" == "rt" || "%{1}" == "rt-debug"\
  Requires: realtime-setup\
  %endif\
@@ -87,7 +87,7 @@ index ea7de5884a89..43dce82a9d36 100644
  Provides: installonlypkg(kernel)\
  Provides: kernel = %{KVERREL}+%{1}\
  %description %{1}\
-@@ -1539,6 +1557,8 @@ Summary: %{variant_summary}\
+@@ -1521,6 +1539,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 +97,5 @@ index ea7de5884a89..43dce82a9d36 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.41.0
+2.45.1
 

pkg/fedora/kernel-surface/patches/0004-default-kernel.patch

@@ -1,7 +1,7 @@
-From 81141a454f41cbc5fd41b778f85b10552c8676e8 Mon Sep 17 00:00:00 2001
+From 64bb7e9daea6e836c3eb8334368ea9cd651ce8db 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] Install scripts and service files for keeping the surface
+Subject: [PATCH 4/5] Install scripts and service files for keeping the surface
  kernel the default
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
@@ -10,10 +10,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 34 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index 43dce82a9d36..28df94e561d4 100644
+index 4f3253f17121..3ce7fbec4beb 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1025,6 +1025,11 @@ Source4000: README.rst
+@@ -974,6 +974,11 @@ Source4000: README.rst
  Source4001: rpminspect.yaml
  Source4002: gating.yaml
  
@@ -25,7 +25,7 @@ index 43dce82a9d36..28df94e561d4 100644
  ## Patches needed for building this package
  
  %if !%{nopatches}
-@@ -1058,6 +1063,7 @@ Requires(pre): %{initrd_prereq}\
+@@ -1007,6 +1012,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 43dce82a9d36..28df94e561d4 100644
  Requires(preun): systemd >= 200\
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
-@@ -1072,6 +1078,14 @@ AutoProv: yes\
+@@ -1021,6 +1027,14 @@ AutoProv: yes\
  %{nil}
  
  
@@ -48,7 +48,7 @@ index 43dce82a9d36..28df94e561d4 100644
  %package doc
  Summary: Various documentation bits found in the kernel source
  Group: Documentation
-@@ -2945,6 +2959,11 @@ find Documentation -type d | xargs chmod u+w
+@@ -3091,6 +3105,11 @@ find Documentation -type d | xargs chmod u+w
  
  cd linux-%{KVERREL}
  
@@ -60,7 +60,7 @@ index 43dce82a9d36..28df94e561d4 100644
  %if %{with_doc}
  docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
  
-@@ -3197,6 +3216,15 @@ popd
+@@ -3347,6 +3366,15 @@ popd
  ### scripts
  ###
  
@@ -76,7 +76,7 @@ index 43dce82a9d36..28df94e561d4 100644
  %if %{with_tools}
  %post -n %{package_name}-tools-libs
  /sbin/ldconfig
-@@ -3609,6 +3637,12 @@ fi\
+@@ -3810,6 +3838,12 @@ fi\
  %{_libexecdir}/kselftests
  %endif
  
@@ -90,5 +90,5 @@ index 43dce82a9d36..28df94e561d4 100644
  %if %{with_up_base}
  %ifnarch %nobuildarches noarch
 -- 
-2.41.0
+2.45.1
 

pkg/fedora/kernel-surface/patches/0005-filter-modules.patch → pkg/fedora/kernel-surface/patches/0005-ipu3-fw.patch

@@ -1,7 +1,7 @@
-From a82af933b2ee35e24140ee7fddf9a083596cda3f Mon Sep 17 00:00:00 2001
+From 076cb99d65797ebc56a798976dc1b043ff58687a 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] Pull in intel-vsc-firmware
+Subject: [PATCH 5/5] Pull in intel-vsc-firmware
 
 This package contains the IPU3 firmware needed for camera support.
 ---
@@ -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 4ece0fa3a56c..768316b2ec82 100644
+index 3ce7fbec4beb..e6bece22b1f3 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1028,6 +1028,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1011,6 +1011,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 4ece0fa3a56c..768316b2ec82 100644
  Recommends: %{package_name}-default-watchdog\
  Requires(preun): systemd >= 200\
 -- 
-2.43.0
+2.45.1
 

pkg/fedora/kernel-surface/secureboot/0001-secureboot.patch

@@ -1,18 +1,18 @@
-From d4bbfbfee98f8b117885cf88a48f686ac889d73e Mon Sep 17 00:00:00 2001
+From 9fe406af6d54768c681817a91cf28e6159725c05 Mon Sep 17 00:00:00 2001
 From: Dorian Stoll <dorian.stoll@tmsp.io>
 Date: Sat, 22 Jul 2023 10:45:33 +0200
 Subject: [PATCH] Use a custom key and certificate for Secure Boot signing
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- redhat/kernel.spec.template | 15 +++++++++------
- 1 file changed, 9 insertions(+), 6 deletions(-)
+ redhat/kernel.spec.template | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index 0fb19cc23041..d7bd6013423c 100644
+index e6bece22b1f3..c5995edff65b 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -762,6 +762,7 @@ BuildRequires: system-sb-certs
+@@ -764,6 +764,7 @@ BuildRequires: system-sb-certs
  %ifarch x86_64 aarch64
  BuildRequires: nss-tools
  BuildRequires: pesign >= 0.10-4
@@ -20,7 +20,7 @@ index 0fb19cc23041..d7bd6013423c 100644
  %endif
  %endif
  %endif
-@@ -821,6 +822,13 @@ Source2: kernel.changelog
+@@ -827,6 +828,13 @@ Source13: redhatsecureboot501.cer
  %define signing_key_filename kernel-signing-s390.cer
  %endif
  
@@ -31,30 +31,18 @@ index 0fb19cc23041..d7bd6013423c 100644
 +
 +%endif
 +
- %if %{?released_kernel}
- 
- Source10: redhatsecurebootca5.cer
-@@ -2201,9 +2209,7 @@ BuildKernel() {
+ # Fedora/ELN pesign macro expects to see these cert file names, see:
+ # https://github.com/rhboot/pesign/blob/main/src/pesign-rpmbuild-helper.in#L216
+ %if 0%{?fedora}%{?eln}
+@@ -2188,7 +2196,7 @@ BuildKernel() {
  
      %ifarch x86_64 aarch64
      %{log_msg "Sign kernel image"}
--    %pesign -s -i $SignImage -o vmlinuz.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
--    %pesign -s -i vmlinuz.tmp -o vmlinuz.signed -a %{secureboot_ca_1} -c %{secureboot_key_1} -n %{pesign_name_1}
--    rm vmlinuz.tmp
+-    %pesign -s -i $SignImage -o vmlinuz.signed -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
 +    sbsign --key %{SOURCE7001} --cert %{SOURCE7002} --output vmlinuz.signed $SignImage
      %endif
      %ifarch s390x ppc64le
      if [ -x /usr/bin/rpm-sign ]; then
-@@ -2783,9 +2789,6 @@ BuildKernel() {
-     %{log_msg "Install certs"}
-     mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
-     %ifarch x86_64 aarch64
--       install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca-20200609.cer
--       install -m 0644 %{secureboot_ca_1} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca-20140212.cer
--       ln -s kernel-signing-ca-20200609.cer $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer
-     %else
-        install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer
-     %endif
 -- 
-2.44.0
+2.45.1