From a1be0353ad3c82b2457d319f7fbca7c885a43a53 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 18 May 2022 11:50:16 -0500 Subject: kernel-5.18.0-0.rc7.20220518git210e04ff7681.55 * Wed May 18 2022 Fedora Kernel Team [5.18.0-0.rc7.210e04ff7681.54] - Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes) - efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones) - efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy) - efi: libstub: declare DXE services table (Baskov Evgeniy) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 12 ++++++------ kernel.spec | 19 ++++++++++++------- sources | 6 +++--- 4 files changed, 22 insertions(+), 17 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 16c18b9f9..9de7b59a5 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 = 54 +RHEL_RELEASE = 55 # # ZSTREAM diff --git a/Patchlist.changelog b/Patchlist.changelog index 64cd43aa2..4a8a831fc 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,11 +1,11 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/4e0c59bd8192d21eabc92379652c91266e1ce221 - 4e0c59bd8192d21eabc92379652c91266e1ce221 efi: x86: Set the NX-compatibility flag in the PE header +"https://gitlab.com/cki-project/kernel-ark/-/commit"/fbcc637def3b72ebbb310b5f5390b41897b612ec + fbcc637def3b72ebbb310b5f5390b41897b612ec efi: x86: Set the NX-compatibility flag in the PE header -"https://gitlab.com/cki-project/kernel-ark/-/commit"/157c035f9a0f5930496e124f646acf3d3af54eff - 157c035f9a0f5930496e124f646acf3d3af54eff efi: libstub: ensure allocated memory to be executable +"https://gitlab.com/cki-project/kernel-ark/-/commit"/47ae50a6d4218348c3f9d8736cc9cfabc0cd2fa7 + 47ae50a6d4218348c3f9d8736cc9cfabc0cd2fa7 efi: libstub: ensure allocated memory to be executable -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b53f8a4eb3206b09529c89e7738fa2671990c632 - b53f8a4eb3206b09529c89e7738fa2671990c632 efi: libstub: declare DXE services table +"https://gitlab.com/cki-project/kernel-ark/-/commit"/c29cf2ab208fbcf27cefce0ab5bad47c07642bc2 + c29cf2ab208fbcf27cefce0ab5bad47c07642bc2 efi: libstub: declare DXE services table "https://gitlab.com/cki-project/kernel-ark/-/commit"/a0c122c4fb17f350396cb664d2fc184df9872279 a0c122c4fb17f350396cb664d2fc184df9872279 tools/power/x86/intel-speed-select: fix build failure when using -Wl,--as-needed diff --git a/kernel.spec b/kernel.spec index c8cce2ba4..95cef7a12 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define specversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc7.54 +%define pkgrelease 0.rc7.20220518git210e04ff7681.55 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.54%{?buildid}%{?dist} +%define specrelease 0.rc7.20220518git210e04ff7681.55%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -694,7 +694,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc7.tar.xz +Source0: linux-5.18-rc7-6-g210e04ff7681.tar.xz Source1: Makefile.rhelver @@ -1386,8 +1386,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc7 -c -mv linux-5.18-rc7 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc7-6-g210e04ff7681 -c +mv linux-5.18-rc7-6-g210e04ff7681 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -3029,12 +3029,17 @@ fi # # %changelog -* Mon May 16 2022 Fedora Kernel Team [5.18.0-0.rc7.53] +* Wed May 18 2022 Fedora Kernel Team [5.18.0-0.rc7.210e04ff7681.54] - Add CONFIG_EFI_DXE_MEM_ATTRIBUTES (Justin M. Forbes) - efi: x86: Set the NX-compatibility flag in the PE header (Peter Jones) - efi: libstub: ensure allocated memory to be executable (Baskov Evgeniy) - efi: libstub: declare DXE services table (Baskov Evgeniy) +* Wed May 18 2022 Fedora Kernel Team [5.18.0-0.rc7.210e04ff7681.53] +- redhat/Makefile.variables: Change git hash length to default (Prarit Bhargava) +- redhat/Makefile: Drop quotation marks around string definitions (Prarit Bhargava) +- Turn on INTEGRITY_MACHINE_KEYRING for Fedora (Justin M. Forbes) + * Mon May 16 2022 Fedora Kernel Team [5.18.0-0.rc7.52] - redhat/configs: fix CONFIG_INTEL_ISHTP_ECLITE (David Arcari) diff --git a/sources b/sources index 8c1e07119..2c9b2d701 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.18-rc7.tar.xz) = 9843bbe95485ee6569d5004902abafb5865ecf58eafd50ce760a5ba30829b32a826dd946af6134e4cbfebd241f3955379ca98a40fa1468bde554b4fa4a8445a9 -SHA512 (kernel-abi-stablelists-5.18.0-0.rc7.54.tar.bz2) = 663015743054bf3c7e93bc206634378e4820cc79cc2c0fe519c613844cafe86ff30bc6429f6dd2fed3f50a5bd8576b95bf3bbb71a0bfe0363a39ea7cd31f0ebb -SHA512 (kernel-kabi-dw-5.18.0-0.rc7.54.tar.bz2) = cc98e1a554cdcb3a09b61dd3ee8d3e7d1ac9b173eaecfe7204e87e3eed1c44ee9e17375918b690ba6a02b0aa6f9e90f6959123836a773678f8ee7a5e28ec34f6 +SHA512 (linux-5.18-rc7-6-g210e04ff7681.tar.xz) = 49c35190479afca9dadbd4a6cb2bfdfa1ad360eb2bdf28cb15a0f895d9cdcb1b617ced741fb99086b1cd797bb0b1be1409aec85e990aea6612a9bd18eed7a8e6 +SHA512 (kernel-abi-stablelists-5.18.0-0.rc7.20220518git210e04ff7681.55.tar.bz2) = 3d764036f34f39ba2772eb9945341711971da4cae53175cd11eb30dad75b289f635572799069e78052aba4f70c87dc0c270b317614dfc0703c1a43c0d818c4ec +SHA512 (kernel-kabi-dw-5.18.0-0.rc7.20220518git210e04ff7681.55.tar.bz2) = 4cdde7ef9a76d4e6f6f83e5bffab56ea74a8cb709e443545ded6088c3cae981a648d8d83c9e089cca3a9c8423fda9f80fa048dffc8b2d04b2c15c15231857770 -- cgit