From d968270b435ac99c5fdaed1b715202f785ef3754 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 6 Jun 2024 07:55:37 -0500 Subject: [PATCH] kernel-6.10.0-0.rc2.20240606git2df0193e62cf.27 * Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] - redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) - Linux v6.10.0-0.rc2.2df0193e62cf Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 5 +++++ kernel.spec | 11 ++++++++--- sources | 6 +++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 5ec3fb3a4..5e0fdae4a 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 26 +RHEL_RELEASE = 27 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index d7995ae8e..624c2ca99 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] +- redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) +- Linux v6.10.0-0.rc2.2df0193e62cf +Resolves: + * Wed Jun 05 2024 Fedora Kernel Team [6.10.0-0.rc2.32f88d65f01b.26] - redhat/kernel.spec: keep extra modules in original directories (Jan Stancek) - Linux v6.10.0-0.rc2.32f88d65f01b diff --git a/kernel.spec b/kernel.spec index d0416e7c9..10c3d7c88 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc2.20240605git32f88d65f01b.26 +%define pkgrelease 0.rc2.20240606git2df0193e62cf.27 %define kversion 6 -%define tarfile_release 6.10-rc2-22-g32f88d65f01b +%define tarfile_release 6.10-rc2-97-g2df0193e62cf # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20240605git32f88d65f01b.26%{?buildid}%{?dist} +%define specrelease 0.rc2.20240606git2df0193e62cf.27%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -2609,6 +2609,7 @@ BuildKernel() { %else UKI_secureboot_name=redhatsecureboot504 %endif + UKI_secureboot_cert=%{_datadir}/pki/sb-certs/secureboot-uki-virt-%{_arch}.cer %pesign -s -i $KernelUnifiedImage -o $KernelUnifiedImage.signed -a %{secureboot_ca_0} -c $UKI_secureboot_cert -n $UKI_secureboot_name # 0%{?fedora}%{?eln} @@ -4017,6 +4018,10 @@ fi\ # # %changelog +* Thu Jun 06 2024 Fedora Kernel Team [6.10.0-0.rc2.2df0193e62cf.27] +- redhat: add missing UKI_secureboot_cert hunk (Patrick Talbert) +- Linux v6.10.0-0.rc2.2df0193e62cf + * Wed Jun 05 2024 Fedora Kernel Team [6.10.0-0.rc2.32f88d65f01b.26] - redhat/kernel.spec: keep extra modules in original directories (Jan Stancek) - Linux v6.10.0-0.rc2.32f88d65f01b diff --git a/sources b/sources index dad224536..7cd2be1e4 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.10-rc2-22-g32f88d65f01b.tar.xz) = 5b1364b99f20a74403f3821daa8b38b6883c43be64aa7591d6cc835e0bfacebd48a8fbcca2ba02998752b634ee38035a863e74199509ff0fa37c0358c5b7fbe5 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 3df51ea4d6c1351f9778c45838cca69b59bec12e603a31663a2f2710ba6c7864c7aa43ec34a2df0b2ae5a38615317a3460c982a5faca2b765a4bfb763c19ea64 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 5e147dfcafb924c8821aff0f4f04a19993712571c68c8203fd6f83b36be2f895c8276d76af22c030c638619a802e02d0ca20773f9c63891292318ff5371d156d +SHA512 (linux-6.10-rc2-97-g2df0193e62cf.tar.xz) = f60a5973c1fdc3c0f95fd1bdad805474e3dee65140fa594c473e4732648a4d3c3a8801c336f6d48cb1c34983669b23f0934a51aec77bd459069e01506e247434 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 8062e8ef9b1033cf0312c5006da4387e6cad3e606168004e3cd9e107672d14d820d78ebc21050d536ba1210327c21b52023a3b2176d82d1da67d4b3739e97a8c +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 24acf9e4cfc695461a63596a2a86bcaf420cdf3deefa4323de36263f67c4a08cdfea4b5d3c66303b265e5359ae629a9b46aee143bdc4cf4077fbbefeb2498ca3