pkg/fedora: Rebase patches

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

@@ -1,4 +1,4 @@
-From bd92f2ec163acc3a109e2fd34793553e4038b4d6 Mon Sep 17 00:00:00 2001
+From 4e9c0d02238463cd3b7dbcb6b255b553191a9761 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 c987db5886f2..1dbc56b1be3b 100644
+index 21f48fb7da63..f32befeebec3 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1001,6 +1001,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1019,6 +1019,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 c987db5886f2..1dbc56b1be3b 100644
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 6e967041622e39df2ce421e8dcdc4aed67e8348d Mon Sep 17 00:00:00 2001
+From 519d55a4d8be9d6278ae6d842bf0d68238e670b6 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,7 +9,7 @@ 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 1dbc56b1be3b..98995c878ea8 100644
+index f32befeebec3..785bc32d0544 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
 @@ -653,6 +653,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
@@ -20,7 +20,7 @@ index 1dbc56b1be3b..98995c878ea8 100644
  %endif
  
  
-@@ -1333,6 +1334,7 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
+@@ -1351,6 +1352,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 1dbc56b1be3b..98995c878ea8 100644
  Provides: installonlypkg(kernel)\
  AutoReqProv: no\
  Requires(pre): findutils\
-@@ -1362,6 +1364,7 @@ against the %{?2:%{2} }kernel package.\
+@@ -1380,6 +1382,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 1dbc56b1be3b..98995c878ea8 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}
-@@ -1483,6 +1486,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
+@@ -1501,6 +1504,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
  Requires: realtime-setup\
  %endif\
  Provides: installonlypkg(kernel)\
@@ -44,7 +44,7 @@ index 1dbc56b1be3b..98995c878ea8 100644
  %description %{1}\
  The meta-package for the %{1} kernel\
  %{nil}
-@@ -1516,6 +1520,7 @@ This package provides KVM modules for package kernel%{?1:-%{1}}.\
+@@ -1534,6 +1538,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 1dbc56b1be3b..98995c878ea8 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.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 1ff16b22002a0c7f76f74042e07d8c44d2fe3db7 Mon Sep 17 00:00:00 2001
+From 33807d72f32905d0e5627904be5263d7a126bf36 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
@@ -10,7 +10,7 @@ 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 98995c878ea8..4f3253f17121 100644
+index 785bc32d0544..890d9225edd8 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
 @@ -654,6 +654,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
@@ -24,7 +24,7 @@ index 98995c878ea8..4f3253f17121 100644
  %endif
  
  
-@@ -1336,6 +1340,8 @@ Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suff
+@@ -1354,6 +1358,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 98995c878ea8..4f3253f17121 100644
  AutoReqProv: no\
  Requires(pre): findutils\
  Requires: findutils\
-@@ -1365,6 +1371,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
+@@ -1383,6 +1389,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 98995c878ea8..4f3253f17121 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}
-@@ -1397,6 +1405,8 @@ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{uname_suffix
+@@ -1415,6 +1423,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 98995c878ea8..4f3253f17121 100644
  AutoReq: no\
  AutoProv: yes\
  %description %{?1:%{1}-}modules-internal\
-@@ -1418,6 +1428,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{?
+@@ -1436,6 +1446,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 98995c878ea8..4f3253f17121 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1441,6 +1453,8 @@ Provides: installonlypkg(kernel-module)\
+@@ -1459,6 +1471,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 98995c878ea8..4f3253f17121 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1463,6 +1477,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:
+@@ -1481,6 +1495,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 98995c878ea8..4f3253f17121 100644
  %if %{-m:1}%{!-m:0}\
  Requires: kernel-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
  %endif\
-@@ -1485,6 +1501,8 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
+@@ -1503,6 +1519,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 98995c878ea8..4f3253f17121 100644
  Provides: installonlypkg(kernel)\
  Provides: kernel = %{KVERREL}+%{1}\
  %description %{1}\
-@@ -1521,6 +1539,8 @@ Summary: %{variant_summary}\
+@@ -1539,6 +1557,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 98995c878ea8..4f3253f17121 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.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 64bb7e9daea6e836c3eb8334368ea9cd651ce8db Mon Sep 17 00:00:00 2001
+From ddb9b1b93df3bf75843ab952534a39a7e8dd7711 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
@@ -6,14 +6,14 @@ Subject: [PATCH 4/5] Install scripts and service files for keeping the surface
 
 Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
 ---
- redhat/kernel.spec.template | 34 ++++++++++++++++++++++++++++++++++
- 1 file changed, 34 insertions(+)
+ redhat/kernel.spec.template | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index 4f3253f17121..3ce7fbec4beb 100644
+index 890d9225edd8..68b06ba0d4b1 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -974,6 +974,11 @@ Source4000: README.rst
+@@ -992,6 +992,11 @@ Source4000: README.rst
  Source4001: rpminspect.yaml
  Source4002: gating.yaml
  
@@ -25,7 +25,7 @@ index 4f3253f17121..3ce7fbec4beb 100644
  ## Patches needed for building this package
  
  %if !%{nopatches}
-@@ -1007,6 +1012,7 @@ Requires(pre): %{initrd_prereq}\
+@@ -1025,6 +1030,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 4f3253f17121..3ce7fbec4beb 100644
  Requires(preun): systemd >= 200\
  Conflicts: xfsprogs < 4.3.0-1\
  Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
-@@ -1021,6 +1027,14 @@ AutoProv: yes\
+@@ -1039,6 +1045,13 @@ AutoProv: yes\
  %{nil}
  
  
@@ -43,12 +43,11 @@ index 4f3253f17121..3ce7fbec4beb 100644
 +This package provides a systemd service that will automatically keep
 +the surface kernel as the default kernel in GRUB, even if a newer stock
 +kernel has been installed.
-+
 +
  %package doc
  Summary: Various documentation bits found in the kernel source
  Group: Documentation
-@@ -3091,6 +3105,11 @@ find Documentation -type d | xargs chmod u+w
+@@ -3170,6 +3183,11 @@ find Documentation -type d | xargs chmod u+w
  
  cd linux-%{KVERREL}
  
@@ -57,10 +56,10 @@ index 4f3253f17121..3ce7fbec4beb 100644
 +install -D -m755 "%{SOURCE4102}" -t "%{buildroot}%{_bindir}"
 +install -D -m755 "%{SOURCE4103}" -t "%{buildroot}%{_presetdir}"
 +
- %if %{with_doc}
- docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
+ # re-define RPM_VMLINUX_H, because it doesn't carry over from %build
+ RPM_VMLINUX_H="$(cat ../vmlinux_h_path)"
  
-@@ -3347,6 +3366,15 @@ popd
+@@ -3441,6 +3459,15 @@ popd
  ### scripts
  ###
  
@@ -76,7 +75,7 @@ index 4f3253f17121..3ce7fbec4beb 100644
  %if %{with_tools}
  %post -n %{package_name}-tools-libs
  /sbin/ldconfig
-@@ -3810,6 +3838,12 @@ fi\
+@@ -3904,6 +3931,12 @@ fi\
  %{_libexecdir}/kselftests
  %endif
  
@@ -90,5 +89,5 @@ index 4f3253f17121..3ce7fbec4beb 100644
  %if %{with_up_base}
  %ifnarch %nobuildarches noarch
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 076cb99d65797ebc56a798976dc1b043ff58687a Mon Sep 17 00:00:00 2001
+From 47af57cd4a28cde0cecfdbb7d55197569a5af721 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 3ce7fbec4beb..e6bece22b1f3 100644
+index 68b06ba0d4b1..40882a465616 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -1011,6 +1011,7 @@ Requires(pre): %{kernel_prereq}\
+@@ -1029,6 +1029,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 3ce7fbec4beb..e6bece22b1f3 100644
  Recommends: %{package_name}-default-watchdog\
  Requires(preun): systemd >= 200\
 -- 
-2.45.1
+2.46.0
 

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

@@ -1,4 +1,4 @@
-From 9fe406af6d54768c681817a91cf28e6159725c05 Mon Sep 17 00:00:00 2001
+From 4283ba47e3bfc34f6d4253b9ece50622d3815b97 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
@@ -9,10 +9,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
  1 file changed, 9 insertions(+), 1 deletion(-)
 
 diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
-index e6bece22b1f3..c5995edff65b 100644
+index 21f48fb7da63..d411e2cd2eda 100644
 --- a/redhat/kernel.spec.template
 +++ b/redhat/kernel.spec.template
-@@ -764,6 +764,7 @@ BuildRequires: system-sb-certs
+@@ -759,6 +759,7 @@ BuildRequires: system-sb-certs
  %ifarch x86_64 aarch64
  BuildRequires: nss-tools
  BuildRequires: pesign >= 0.10-4
@@ -20,7 +20,7 @@ index e6bece22b1f3..c5995edff65b 100644
  %endif
  %endif
  %endif
-@@ -827,6 +828,13 @@ Source13: redhatsecureboot501.cer
+@@ -830,6 +831,13 @@ Source13: redhatsecureboot501.cer
  %define signing_key_filename kernel-signing-s390.cer
  %endif
  
@@ -34,7 +34,7 @@ index e6bece22b1f3..c5995edff65b 100644
  # 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() {
+@@ -2192,7 +2200,7 @@ BuildKernel() {
  
      %ifarch x86_64 aarch64
      %{log_msg "Sign kernel image"}
@@ -44,5 +44,5 @@ index e6bece22b1f3..c5995edff65b 100644
      %ifarch s390x ppc64le
      if [ -x /usr/bin/rpm-sign ]; then
 -- 
-2.45.1
+2.46.0