diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-10 13:51:28 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-10 13:51:28 +0100 |
commit | 8f6d9c871581cf48177ae96ae6b5bf529d3ac2ef (patch) | |
tree | 1cd7ca1fd5e400365ccc454beadfe2e4e649def5 /kernel.spec | |
parent | 678acff44c95c63665b7cba5c3c619413106a107 (diff) | |
parent | d17020a31f96c5f444c15ee905d99cd84a78b0fa (diff) | |
download | kernel-8f6d9c871581cf48177ae96ae6b5bf529d3ac2ef.tar.gz kernel-8f6d9c871581cf48177ae96ae6b5bf529d3ac2ef.tar.xz kernel-8f6d9c871581cf48177ae96ae6b5bf529d3ac2ef.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.16.0-60.vanilla.1.fc36kernel-5.16.0-60.vanilla.1.fc35kernel-5.16.0-60.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 469a5fd6e..88dcbe324 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc8.20220107gitddec8ed2d490.57 +%global distro_build 60 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.16.0 %define patchversion 5.16 -%define pkgrelease 0.rc8.20220107gitddec8ed2d490.57 +%define pkgrelease 60 # This is needed to do merge window version magic %define patchlevel 16 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.20220107gitddec8ed2d490.57%{?buildid}%{?dist} +%define specrelease 60%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -691,7 +691,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-rc8-57-gddec8ed2d490.tar.xz +Source0: linux-5.16.tar.xz Source1: Makefile.rhelver @@ -1385,8 +1385,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-rc8-57-gddec8ed2d490 -c -mv linux-5.16-rc8-57-gddec8ed2d490 linux-%{KVERREL} +%setup -q -n kernel-5.16 -c +mv linux-5.16 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2987,6 +2987,11 @@ fi # # %changelog +* Sun Jan 09 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc8.20220109git4634129ad9fd.59] +- redhat/configs: Migrate ZRAM_DEF_* configs to common/ (Neal Gompa) +- redhat/configs: Enable CONFIG_CRYPTO_ZSTD (Neal Gompa) [2032758] +- Turn CONFIG_DEVMEM back off for aarch64 (Justin M. Forbes) + * Fri Jan 07 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.16-0.rc8.20220107gitddec8ed2d490.57] - Clean up excess text in Fedora config files (Justin M. Forbes) |