diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-23 20:45:13 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-07-23 20:45:13 +0200 |
| commit | 13f37e7fe398411ef06f9bc489678bca23854e93 (patch) | |
| tree | dd5f02c1f33f1362f07c9e1b7f63d20f34c722de /kernel.spec | |
| parent | 88cd7f3c81e0773ec035a3bd163b5f213173bc88 (diff) | |
| parent | e7f8b3f4a6dc6b1770afb143d65b17e86ca20d41 (diff) | |
| download | kernel-13f37e7fe398411ef06f9bc489678bca23854e93.tar.gz kernel-13f37e7fe398411ef06f9bc489678bca23854e93.tar.xz kernel-13f37e7fe398411ef06f9bc489678bca23854e93.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc33kernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc32kernel-5.8.0-0.rc6.20200723gitd15be546031c.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 9140dee92..51e62f5b6 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.rc6.20200721git4fa640dc5230.1 +%global distro_build 0.rc6.20200723gitd15be546031c.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,13 +71,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.8.0 -%define pkgrelease 0.rc6.20200721git4fa640dc5230.1 +%define pkgrelease 0.rc6.20200723gitd15be546031c.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20200721git4fa640dc5230.1%{?buildid}%{?dist} +%define specrelease 0.rc6.20200723gitd15be546031c.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200721git4fa640dc5230.tar.xz +Source0: linux-20200723gitd15be546031c.tar.xz Source1: Makefile.rhelver @@ -1310,8 +1310,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200721git4fa640dc5230 -c -mv linux-20200721git4fa640dc5230 linux-%{KVERREL} +%setup -q -n kernel-20200723gitd15be546031c -c +mv linux-20200723gitd15be546031c linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2848,6 +2848,11 @@ fi # # %changelog +* Thu Jul 23 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200723gitd15be546031c.1] +- d15be546031c rebase +- fedora: arm: Update some meson config options (Peter Robinson) +- Updated changelog for the release based on 4fa640dc5230 (Fedora Kernel Team) + * Tue Jul 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200721git4fa640dc5230.1] - 4fa640dc5230 rebase - Updated changelog for the release based on 5714ee50bb43 (Fedora Kernel Team) |