diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-18 19:43:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-18 19:43:53 +0200 |
| commit | af5cfd74bb5275231986cca19f48467012f85243 (patch) | |
| tree | 5da58cfdc1f40965443806e72ef4a658850b52b6 /kernel.spec | |
| parent | deb9ee0fa5386974c5835d6a139aa5c386fb2018 (diff) | |
| parent | a1be0353ad3c82b2457d319f7fbca7c885a43a53 (diff) | |
| download | kernel-af5cfd74bb5275231986cca19f48467012f85243.tar.gz kernel-af5cfd74bb5275231986cca19f48467012f85243.tar.xz kernel-af5cfd74bb5275231986cca19f48467012f85243.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 304197137..b1dc298d1 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 @@ -131,13 +131,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} @@ -696,7 +696,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 @@ -1388,8 +1388,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} . @@ -3035,12 +3035,17 @@ fi # # %changelog -* Mon May 16 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc7.53] +* Wed May 18 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [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 <kernel-team@fedoraproject.org> [5.18.0-0.rc7.52] - redhat/configs: fix CONFIG_INTEL_ISHTP_ECLITE (David Arcari) |