diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-10 16:12:24 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-05-10 16:12:24 +0200 |
| commit | 555d963c225e4132f04d748878f5b2c33b347659 (patch) | |
| tree | a7fcf7e3ab6eab200c453297ae99794aedff787a /kernel.spec | |
| parent | 244320bc270fa1f292db7c044269c96cd3a532f0 (diff) | |
| parent | 834220e9b94b91e77c3b7f3120b49ab596e1bdf3 (diff) | |
| download | kernel-555d963c225e4132f04d748878f5b2c33b347659.tar.gz kernel-555d963c225e4132f04d748878f5b2c33b347659.tar.xz kernel-555d963c225e4132f04d748878f5b2c33b347659.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 4ccd3d246..3aa188d68 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.rc6.47 +%define pkgrelease 0.rc6.20220510git9be9ed2612b5aed.49 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.47%{?buildid}%{?dist} +%define specrelease 0.rc6.20220510git9be9ed2612b5aed.49%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -692,7 +692,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.18-rc6.tar.xz +Source0: linux-5.18-rc6-7-g9be9ed2612b5aed.tar.xz Source1: Makefile.rhelver @@ -1384,8 +1384,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.18-rc6 -c -mv linux-5.18-rc6 linux-%{KVERREL} +%setup -q -n kernel-5.18-rc6-7-g9be9ed2612b5aed -c +mv linux-5.18-rc6-7-g9be9ed2612b5aed linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3031,6 +3031,16 @@ fi # # %changelog +* Tue May 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.9be9ed2612b5aed.48] +- 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) + +* Tue May 10 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.9be9ed2612b5aed.47] +- fedora: arm: Enable new Rockchip 356x series drivers (Peter Robinson) +- fedora: arm: enable DRM_I2C_NXP_TDA998X on aarch64 (Peter Robinson) + * Mon May 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc6.46] - redhat/self-test: Add test to verify Makefile declarations. (Prarit Bhargava) - redhat/Makefile: Add RHTEST (Prarit Bhargava) |