diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-27 07:13:45 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-27 07:13:45 +0200 |
commit | 54b40e64aa019da0d30ca407e8e6ef81e0e8ce2f (patch) | |
tree | 72365cf5bd9923096bdb12d9b7d7d8e0a5d8e188 /kernel.spec | |
parent | 8a814e7519cfc083d2bbac9eca7137f071a6108a (diff) | |
parent | a442226220170c596044cae16af0f4ca133d6d84 (diff) | |
download | kernel-54b40e64aa019da0d30ca407e8e6ef81e0e8ce2f.tar.gz kernel-54b40e64aa019da0d30ca407e8e6ef81e0e8ce2f.tar.xz kernel-54b40e64aa019da0d30ca407e8e6ef81e0e8ce2f.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-198.vanilla.1.fc35kernel-5.12.0-198.vanilla.1.fc34kernel-5.12.0-198.vanilla.1.fc33kernel-5.12.0-198.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 4676e3563..be397e022 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc8.20210423git7af08140979a.193 +%global distro_build 198 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -109,13 +109,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc8.20210423git7af08140979a.193 +%define pkgrelease 198 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc8.20210423git7af08140979a.193%{?buildid}%{?dist} +%define specrelease 198%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -624,7 +624,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210423git7af08140979a.tar.xz +Source0: linux-5.12.tar.xz Source1: Makefile.rhelver @@ -1279,8 +1279,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210423git7af08140979a -c -mv linux-20210423git7af08140979a linux-%{KVERREL} +%setup -q -n kernel-5.12 -c +mv linux-5.12 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2795,6 +2795,12 @@ fi # # %changelog +* Mon Apr 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-198] +- mod-extra.list.fedora: remove 72 unused modules (Paul Bolle) + +* Mon Apr 26 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-197] +- Create ark-latest branch last for CI scripts (Don Zickus) + * Wed Apr 21 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.12.0-0.rc8.20210421git7af08140979a.193] - Replace /usr/libexec/platform-python with /usr/bin/python3 (David Ward) |