diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-16 18:41:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-16 18:41:11 +0200 |
| commit | 005c641a033a96ffc25e32fd4e39001248776fc1 (patch) | |
| tree | 932ddc8d05275b2a49d4292abd10035d1e154510 /kernel.spec | |
| parent | 7cd44b0d9e568daf01b3f24b4528a1be17352f3d (diff) | |
| parent | 7464e60427be7b6af8d65b8db72db1ef2bb28549 (diff) | |
| download | kernel-005c641a033a96ffc25e32fd4e39001248776fc1.tar.gz kernel-005c641a033a96ffc25e32fd4e39001248776fc1.tar.xz kernel-005c641a033a96ffc25e32fd4e39001248776fc1.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc1.20210714git40226a3d96ef.18.vanilla.1.fc35kernel-5.14.0-0.rc1.20210714git40226a3d96ef.18.vanilla.1.fc34kernel-5.14.0-0.rc1.20210714git40226a3d96ef.18.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 506d7926d..92b0e5fc2 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc1.20210713git7fef2edf7cc7.18 +%global distro_build 0.rc1.20210714git40226a3d96ef.18 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -119,13 +119,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc1.20210713git7fef2edf7cc7.18 +%define pkgrelease 0.rc1.20210714git40226a3d96ef.18 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20210713git7fef2edf7cc7.18%{?buildid}%{?dist} +%define specrelease 0.rc1.20210714git40226a3d96ef.18%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -657,7 +657,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc1-3-g7fef2edf7cc7.tar.xz +Source0: linux-5.14-rc1-16-g40226a3d96ef.tar.xz Source1: Makefile.rhelver @@ -1342,8 +1342,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc1-3-g7fef2edf7cc7 -c -mv linux-5.14-rc1-3-g7fef2edf7cc7 linux-%{KVERREL} +%setup -q -n kernel-5.14-rc1-16-g40226a3d96ef -c +mv linux-5.14-rc1-16-g40226a3d96ef linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2928,7 +2928,8 @@ fi # # %changelog -* Tue Jul 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210713git7fef2edf7cc7.18] +* Wed Jul 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210714git40226a3d96ef.18] +- CI: Handle all mirrors (Veronika Kabatova) - Turn on CONFIG_STACKTRACE for s390x zfpcdump kernels (Justin M. Forbes) * Tue Jul 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc1.20210713git7fef2edf7cc7.17] |