diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-14 18:42:51 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-14 18:42:51 +0200 |
commit | e4dade3c8881b637571e8accee52ea8d5dfd13ff (patch) | |
tree | 35a9408096a4477c61a66aa74697a9b369c88d7a /kernel.spec | |
parent | 6843891cf8287a3491c8188f927be6c9b15433be (diff) | |
parent | 351b480089e439ed4f8da85787b1b002d1b53a62 (diff) | |
download | kernel-e4dade3c8881b637571e8accee52ea8d5dfd13ff.tar.gz kernel-e4dade3c8881b637571e8accee52ea8d5dfd13ff.tar.xz kernel-e4dade3c8881b637571e8accee52ea8d5dfd13ff.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.vanilla.1.fc34kernel-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.vanilla.1.fc33kernel-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.vanilla.1.fc32kernel-5.10.0-0.rc0.20201014gitb5fc7a89e58b.41.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 48fd1d85d..8096421c7 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.20201013gitc4439713e82a.40 +%global distro_build 0.rc0.20201014gitb5fc7a89e58b.41 %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.20201013gitc4439713e82a.40 +%define pkgrelease 0.rc0.20201014gitb5fc7a89e58b.41 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20201013gitc4439713e82a.40%{?buildid}%{?dist} +%define specrelease 0.rc0.20201014gitb5fc7a89e58b.41%{?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-20201013gitc4439713e82a.tar.xz +Source0: linux-20201014gitb5fc7a89e58b.tar.xz Source1: Makefile.rhelver @@ -1212,8 +1212,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201013gitc4439713e82a -c -mv linux-20201013gitc4439713e82a linux-%{KVERREL} +%setup -q -n kernel-20201014gitb5fc7a89e58b -c +mv linux-20201014gitb5fc7a89e58b linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2639,10 +2639,13 @@ fi # # %changelog -* Tue Oct 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201013gitc4439713e82a.39] +* Wed Oct 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201014gitb5fc7a89e58b.40] - 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") +* Wed Oct 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201014gitb5fc7a89e58b.39.test] +- b5fc7a89e58b rebase + * Tue Oct 13 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc0.20201013gitc4439713e82a.38.test] - c4439713e82a rebase |