diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-21 21:25:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-21 21:25:53 +0200 |
| commit | 469f08f37160f604540026f432ca1c40b21f79f2 (patch) | |
| tree | c63dc152f3518e34afb04041213915a966e047b7 /kernel.spec | |
| parent | 94d66ef4d85b763475cd4af232f62f0b714fb4bc (diff) | |
| parent | 5457c8dc3370e574c422727780bda1da0c9fc1a5 (diff) | |
| download | kernel-469f08f37160f604540026f432ca1c40b21f79f2.tar.gz kernel-469f08f37160f604540026f432ca1c40b21f79f2.tar.xz kernel-469f08f37160f604540026f432ca1c40b21f79f2.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc0.20201021git071a0578b0ce.49.vanilla.1.fc34kernel-5.10.0-0.rc0.20201021git071a0578b0ce.49.vanilla.1.fc33kernel-5.10.0-0.rc0.20201021git071a0578b0ce.49.vanilla.1.fc32kernel-5.10.0-0.rc0.20201021git071a0578b0ce.49.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index d25f7d973..09c969b69 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20201019git071a0578b0ce.48 +%global distro_build 0.rc0.20201021git071a0578b0ce.49 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc0.20201019git071a0578b0ce.48 +%define pkgrelease 0.rc0.20201021git071a0578b0ce.49 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20201019git071a0578b0ce.48%{?buildid}%{?dist} +%define specrelease 0.rc0.20201021git071a0578b0ce.49%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -568,7 +568,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201019git071a0578b0ce.tar.xz +Source0: linux-20201021git071a0578b0ce.tar.xz Source1: Makefile.rhelver @@ -1212,8 +1212,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201019git071a0578b0ce -c -mv linux-20201019git071a0578b0ce linux-%{KVERREL} +%setup -q -n kernel-20201021git071a0578b0ce -c +mv linux-20201021git071a0578b0ce linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2639,13 +2639,14 @@ fi # # %changelog -* Mon Oct 19 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.10.0-0.rc0.20201019git071a0578b0ce.48] -- Fedora config updates ("Justin M. Forbes") - -* Mon Oct 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201019git071a0578b0ce.47] +* Tue Oct 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201020git071a0578b0ce.48] - Filter out LTO build options from the perl ccopts ("Justin M. Forbes") - Work around for gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96377 ("Justin M. Forbes") +* Tue Oct 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201020git071a0578b0ce.47.test] +- Fix Fedora config locations ("Justin M. Forbes") +- Fedora config updates ("Justin M. Forbes") + * Sat Oct 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201017git071a0578b0ce.44.test] - 071a0578b0ce rebase - configs: enable CONFIG_CRYPTO_CTS=y so cts(cbc(aes)) is available in FIPS mode (Vladis Dronov) |