pkg: fedora: Rebase onto v6.4.4
This commit is contained in:
Dorian Stoll
parent
bf67ee0c53
commit
ae05c31c26
|
|
@ -18,13 +18,13 @@ PACKAGE_NAME = "surface"
|
|||
## Fedora tags: kernel-X.Y.Z
|
||||
## Upstream tags: vX.Y.Z
|
||||
##
|
||||
PACKAGE_TAG = "kernel-6.3.12-0"
|
||||
PACKAGE_TAG = "kernel-6.4.4-0"
|
||||
|
||||
##
|
||||
## The release number of the modified kernel package.
|
||||
## e.g. 300 for kernel-6.3.1-300.fc38.foo
|
||||
##
|
||||
PACKAGE_RELEASE = "2"
|
||||
PACKAGE_RELEASE = "1"
|
||||
|
||||
##
|
||||
## Build options for configuring which parts of the kernel package are enabled.
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 5fc0582727cb64230d1c2ac02001263f92a9b82c Mon Sep 17 00:00:00 2001
|
||||
From 1cad947df5f2ec874863e42cce595a76dad64cc2 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Sun, 14 May 2023 09:21:43 +0200
|
||||
Date: Sat, 22 Jul 2023 10:33:03 +0200
|
||||
Subject: [PATCH] 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 51f43b21b018..d61276b49d95 100644
|
||||
index d3dafe56aa64..24823cd8b784 100644
|
||||
--- a/redhat/kernel.spec.template
|
||||
+++ b/redhat/kernel.spec.template
|
||||
@@ -938,6 +938,7 @@ Requires(pre): %{kernel_prereq}\
|
||||
@@ -1052,6 +1052,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 51f43b21b018..d61276b49d95 100644
|
|||
Conflicts: xfsprogs < 4.3.0-1\
|
||||
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 4f7a333fc3dbacc4b3fa25ea117cb59f865878af Mon Sep 17 00:00:00 2001
|
||||
From 17907fed744ae17414a1ad8bebc335e12dac7691 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Sun, 14 May 2023 15:04:22 +0200
|
||||
Date: Sat, 22 Jul 2023 10:34:38 +0200
|
||||
Subject: [PATCH] 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 51f43b21b018..2d91719b7d93 100644
|
||||
index 24823cd8b784..ea7de5884a89 100644
|
||||
--- a/redhat/kernel.spec.template
|
||||
+++ b/redhat/kernel.spec.template
|
||||
@@ -598,6 +598,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
|
||||
@@ -697,6 +697,7 @@ Requires: kernel-core-uname-r = %{KVERREL}
|
||||
Requires: kernel-modules-uname-r = %{KVERREL}
|
||||
Requires: kernel-modules-core-uname-r = %{KVERREL}
|
||||
Provides: installonlypkg(kernel)
|
||||
|
|
@ -20,15 +20,15 @@ index 51f43b21b018..2d91719b7d93 100644
|
|||
%endif
|
||||
|
||||
|
||||
@@ -1226,6 +1227,7 @@ Summary: Development package for building kernel modules to match the %{?2:%{2}
|
||||
@@ -1352,6 +1353,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}%{?1:+%{1}}\
|
||||
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{uname_suffix %{?1:+%{1}}}\
|
||||
Provides: kernel-devel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
|
||||
+Provides: kernel-devel = %{KVERREL}%{?1:+%{1}}\
|
||||
Provides: installonlypkg(kernel)\
|
||||
AutoReqProv: no\
|
||||
Requires(pre): findutils\
|
||||
@@ -1255,6 +1257,7 @@ against the %{?2:%{2} }kernel package.\
|
||||
@@ -1381,6 +1383,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,22 +36,22 @@ index 51f43b21b018..2d91719b7d93 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}
|
||||
@@ -1373,6 +1376,7 @@ Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
|
||||
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
|
||||
Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\
|
||||
@@ -1502,6 +1505,7 @@ Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{uname_suffix %{1}}\
|
||||
Requires: realtime-setup\
|
||||
%endif\
|
||||
Provides: installonlypkg(kernel)\
|
||||
+Provides: kernel = %{KVERREL}+%{1}\
|
||||
%description %{1}\
|
||||
The meta-package for the %{1} kernel\
|
||||
%{nil}
|
||||
@@ -1387,6 +1391,7 @@ The meta-package for the %{1} kernel\
|
||||
@@ -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}%{?1:+%{1}}\
|
||||
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
|
||||
Provides: installonlypkg(kernel)\
|
||||
+Provides: kernel-%{?1:%{1}-}core = %{KVERREL}%{?1:+%{1}}\
|
||||
%if %{-m:1}%{!-m:0}\
|
||||
Requires: kernel-core-uname-r = %{KVERREL}\
|
||||
Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 360961a67b03503c59b7434ccc5bd1d2fa40b55e Mon Sep 17 00:00:00 2001
|
||||
From 819c1b06089925d6944bf2dad9dc29649b7510d5 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Sun, 14 May 2023 18:16:38 +0200
|
||||
Date: Sat, 22 Jul 2023 10:40:32 +0200
|
||||
Subject: [PATCH] Let kernel-surface conflict with older versions of the
|
||||
package
|
||||
|
||||
|
|
@ -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 d952180f91ef..dc95736a227e 100644
|
||||
index ea7de5884a89..43dce82a9d36 100644
|
||||
--- a/redhat/kernel.spec.template
|
||||
+++ b/redhat/kernel.spec.template
|
||||
@@ -599,6 +599,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
|
||||
@@ -698,6 +698,10 @@ Requires: kernel-modules-uname-r = %{KVERREL}
|
||||
Requires: kernel-modules-core-uname-r = %{KVERREL}
|
||||
Provides: installonlypkg(kernel)
|
||||
Provides: kernel = %{KVERREL}
|
||||
|
|
@ -24,8 +24,8 @@ index d952180f91ef..dc95736a227e 100644
|
|||
%endif
|
||||
|
||||
|
||||
@@ -1230,6 +1234,8 @@ Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
|
||||
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
@@ -1355,6 +1359,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)\
|
||||
+Conflicts: %{package_name}-devel < 6.3.7-2\
|
||||
|
|
@ -33,7 +33,7 @@ index d952180f91ef..dc95736a227e 100644
|
|||
AutoReqProv: no\
|
||||
Requires(pre): findutils\
|
||||
Requires: findutils\
|
||||
@@ -1259,6 +1265,8 @@ Summary: Meta package to install matching core and devel packages for a given %{
|
||||
@@ -1384,6 +1390,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,60 +42,60 @@ index d952180f91ef..dc95736a227e 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}
|
||||
@@ -1291,6 +1299,8 @@ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
@@ -1416,6 +1424,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\
|
||||
@@ -1312,6 +1322,8 @@ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
@@ -1437,6 +1447,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}}}\
|
||||
+Conflicts: %{package_name}-modules-extra < 6.3.7-2\
|
||||
+Obsoletes: %{package_name}-modules-extra < 6.3.7-2\
|
||||
%if %{-m:1}%{!-m:0}\
|
||||
Requires: kernel-modules-extra-uname-r = %{KVERREL}\
|
||||
Requires: kernel-modules-extra-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
%endif\
|
||||
@@ -1335,6 +1347,8 @@ Provides: installonlypkg(kernel-module)\
|
||||
Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
@@ -1460,6 +1472,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}}}\
|
||||
+Conflicts: %{package_name}-modules < 6.3.7-2\
|
||||
+Obsoletes: %{package_name}-modules < 6.3.7-2\
|
||||
%if %{-m:1}%{!-m:0}\
|
||||
Requires: kernel-modules-uname-r = %{KVERREL}\
|
||||
Requires: kernel-modules-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
%endif\
|
||||
@@ -1357,6 +1371,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{?1:+%{1}}\
|
||||
@@ -1482,6 +1496,8 @@ Provides: kernel-modules-core = %{specrpmversion}-%{release}%{uname_suffix %{?1:
|
||||
Provides: installonlypkg(kernel-module)\
|
||||
Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
|
||||
Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:+%{1}}}\
|
||||
+Conflicts: %{package_name}-modules-core < 6.3.7-2\
|
||||
+Obsoletes: %{package_name}-modules-core < 6.3.7-2\
|
||||
%if %{-m:1}%{!-m:0}\
|
||||
Requires: kernel-modules-core-uname-r = %{KVERREL}\
|
||||
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}}\
|
||||
%if "%{1}" == "rt" || "%{1}" == "rt-debug"\
|
||||
Requires: realtime-setup\
|
||||
%endif\
|
||||
@@ -1376,6 +1392,8 @@ summary: kernel meta-package for the %{1} kernel\
|
||||
Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\
|
||||
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\
|
||||
Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\
|
||||
+Conflicts: %{package_name} < 6.3.7-2\
|
||||
+Obsoletes: %{package_name} < 6.3.7-2\
|
||||
Provides: installonlypkg(kernel)\
|
||||
Provides: kernel = %{KVERREL}+%{1}\
|
||||
%description %{1}\
|
||||
@@ -1393,6 +1411,8 @@ Summary: %{variant_summary}\
|
||||
Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
@@ -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}}\
|
||||
+Conflicts: %{package_name}-core < 6.3.7-2\
|
||||
+Obsoletes: %{package_name}-core < 6.3.7-2\
|
||||
%if %{-m:1}%{!-m:0}\
|
||||
Requires: kernel-core-uname-r = %{KVERREL}\
|
||||
Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
|
||||
Requires: kernel-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{?1:+%{1}}}\
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From a45b4c3fcb7d364f236a25e03378a6b03a9cc627 Mon Sep 17 00:00:00 2001
|
||||
From 81141a454f41cbc5fd41b778f85b10552c8676e8 Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Sat, 3 Jun 2023 11:47:02 +0200
|
||||
Date: Sat, 22 Jul 2023 10:41:11 +0200
|
||||
Subject: [PATCH] Install scripts and service files for keeping the surface
|
||||
kernel the default
|
||||
|
||||
|
|
@ -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 dc95736a227e..4d6504ca721b 100644
|
||||
index 43dce82a9d36..28df94e561d4 100644
|
||||
--- a/redhat/kernel.spec.template
|
||||
+++ b/redhat/kernel.spec.template
|
||||
@@ -911,6 +911,11 @@ Source4000: README.rst
|
||||
@@ -1025,6 +1025,11 @@ Source4000: README.rst
|
||||
Source4001: rpminspect.yaml
|
||||
Source4002: gating.yaml
|
||||
|
||||
|
|
@ -25,7 +25,7 @@ index dc95736a227e..4d6504ca721b 100644
|
|||
## Patches needed for building this package
|
||||
|
||||
%if !%{nopatches}
|
||||
@@ -944,6 +949,7 @@ Requires(pre): %{initrd_prereq}\
|
||||
@@ -1058,6 +1063,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 dc95736a227e..4d6504ca721b 100644
|
|||
Requires(preun): systemd >= 200\
|
||||
Conflicts: xfsprogs < 4.3.0-1\
|
||||
Conflicts: xorg-x11-drv-vmmouse < 13.0.99\
|
||||
@@ -958,6 +964,14 @@ AutoProv: yes\
|
||||
@@ -1072,6 +1078,14 @@ AutoProv: yes\
|
||||
%{nil}
|
||||
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ index dc95736a227e..4d6504ca721b 100644
|
|||
%package doc
|
||||
Summary: Various documentation bits found in the kernel source
|
||||
Group: Documentation
|
||||
@@ -2691,6 +2705,11 @@ find Documentation -type d | xargs chmod u+w
|
||||
@@ -2945,6 +2959,11 @@ find Documentation -type d | xargs chmod u+w
|
||||
|
||||
cd linux-%{KVERREL}
|
||||
|
||||
|
|
@ -60,7 +60,7 @@ index dc95736a227e..4d6504ca721b 100644
|
|||
%if %{with_doc}
|
||||
docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
|
||||
|
||||
@@ -2938,6 +2957,15 @@ popd
|
||||
@@ -3197,6 +3216,15 @@ popd
|
||||
### scripts
|
||||
###
|
||||
|
||||
|
|
@ -76,7 +76,7 @@ index dc95736a227e..4d6504ca721b 100644
|
|||
%if %{with_tools}
|
||||
%post -n %{package_name}-tools-libs
|
||||
/sbin/ldconfig
|
||||
@@ -3313,6 +3341,12 @@ fi
|
||||
@@ -3609,6 +3637,12 @@ fi\
|
||||
%{_libexecdir}/kselftests
|
||||
%endif
|
||||
|
||||
|
|
@ -87,8 +87,8 @@ index dc95736a227e..4d6504ca721b 100644
|
|||
+%{_presetdir}/90-linux-surface-default-watchdog.preset
|
||||
+
|
||||
# empty meta-package
|
||||
%if %{with_up_base}
|
||||
%ifnarch %nobuildarches noarch
|
||||
%files
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
From 67f8052f553191686b1224b5598d00ff33d38608 Mon Sep 17 00:00:00 2001
|
||||
From 71133b4337411ddd550d5e5ef68a12c510740b2c Mon Sep 17 00:00:00 2001
|
||||
From: Dorian Stoll <dorian.stoll@tmsp.io>
|
||||
Date: Sat, 13 May 2023 16:39:50 +0200
|
||||
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>
|
||||
|
|
@ -9,10 +9,10 @@ Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
|
|||
1 file changed, 9 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
|
||||
index 51f43b21b018..76d1ad8e2818 100644
|
||||
index 28df94e561d4..fd44abc4118a 100644
|
||||
--- a/redhat/kernel.spec.template
|
||||
+++ b/redhat/kernel.spec.template
|
||||
@@ -703,6 +703,7 @@ BuildRequires: system-sb-certs
|
||||
@@ -805,6 +805,7 @@ BuildRequires: system-sb-certs
|
||||
%ifarch x86_64 aarch64
|
||||
BuildRequires: nss-tools
|
||||
BuildRequires: pesign >= 0.10-4
|
||||
|
|
@ -20,7 +20,7 @@ index 51f43b21b018..76d1ad8e2818 100644
|
|||
%endif
|
||||
%endif
|
||||
%endif
|
||||
@@ -762,6 +763,13 @@ Source1: Makefile.rhelver
|
||||
@@ -864,6 +865,13 @@ Source1: Makefile.rhelver
|
||||
%define signing_key_filename kernel-signing-s390.cer
|
||||
%endif
|
||||
|
||||
|
|
@ -34,8 +34,8 @@ index 51f43b21b018..76d1ad8e2818 100644
|
|||
%if %{?released_kernel}
|
||||
|
||||
Source10: redhatsecurebootca5.cer
|
||||
@@ -1860,9 +1868,7 @@ BuildKernel() {
|
||||
fi
|
||||
@@ -2096,9 +2104,7 @@ BuildKernel() {
|
||||
SignImage=$KernelImage
|
||||
|
||||
%ifarch x86_64 aarch64
|
||||
- %pesign -s -i $SignImage -o vmlinuz.tmp -a %{secureboot_ca_0} -c %{secureboot_key_0} -n %{pesign_name_0}
|
||||
|
|
@ -45,7 +45,7 @@ index 51f43b21b018..76d1ad8e2818 100644
|
|||
%endif
|
||||
%ifarch s390x ppc64le
|
||||
if [ -x /usr/bin/rpm-sign ]; then
|
||||
@@ -2393,9 +2399,6 @@ BuildKernel() {
|
||||
@@ -2650,9 +2656,6 @@ BuildKernel() {
|
||||
# Red Hat UEFI Secure Boot CA cert, which can be used to authenticate the kernel
|
||||
mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer
|
||||
%ifarch x86_64 aarch64
|
||||
|
|
@ -56,5 +56,5 @@ index 51f43b21b018..76d1ad8e2818 100644
|
|||
install -m 0644 %{secureboot_ca_0} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/kernel-signing-ca.cer
|
||||
%endif
|
||||
--
|
||||
2.40.1
|
||||
2.41.0
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue