diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-05 20:10:00 +0200 |
| commit | f4c3c7a8ab9226af448d66103dfddf387711af9d (patch) | |
| tree | fe668c86a171420067eefe2b30ab4ca764ebd4c8 /kernel.spec | |
| parent | d2c10672fc73b0484b5bd441c7a43087a20cfc61 (diff) | |
| parent | 4459220aecb835a73131f0de65f5d9b4200a8efc (diff) | |
| download | kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.gz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.tar.xz kernel-f4c3c7a8ab9226af448d66103dfddf387711af9d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200605git435faf5c218a.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 228fb3702..efc2e6be4 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.20200604git9fb4c5250f10.1 +%global distro_build 0.rc0.20200605git435faf5c218a.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc0.20200604git9fb4c5250f10.1 +%define pkgrelease 0.rc0.20200605git435faf5c218a.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20200604git9fb4c5250f10.1%{?buildid}%{?dist} +%define specrelease 0.rc0.20200605git435faf5c218a.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200604git9fb4c5250f10.tar.xz +Source0: linux-20200605git435faf5c218a.tar.xz Source1: Makefile.rhelver @@ -1282,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200604git9fb4c5250f10 -c -mv linux-20200604git9fb4c5250f10 linux-%{KVERREL} +%setup -q -n kernel-20200605git435faf5c218a -c +mv linux-20200605git435faf5c218a linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2788,11 +2788,13 @@ fi # # %changelog -* Thu Jun 04 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc0.20200604git9fb4c5250f10.1] -- More Fedora config work ("Justin M. Forbes") +* Fri Jun 05 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc0.20200605git435faf5c218a.1] +- Fedora config updates ("Justin M. Forbes") +- Fix up module filtering for 5.8 ("Justin M. Forbes") -* Thu Jun 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc0.20200604git9fb4c5250f10.1] -- 9fb4c5250f10 rebase +* Fri Jun 05 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc0.20200605git435faf5c218a.1] +- 435faf5c218a rebase +- More Fedora config work ("Justin M. Forbes") - RTW88BE and CE have been extracted to their own modules ("Justin M. Forbes") - Set CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK for Fedora ("Justin M. Forbes") - Arm64 Use Branch Target Identification for kernel ("Justin M. Forbes") |