diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-18 16:32:47 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-18 16:32:47 +0200 |
| commit | 268fd48fcb2ea8b2a0fac8148fa6df88fa43bc43 (patch) | |
| tree | 033cf21a08aced20e8441f53da7885e90d1e7483 /kernel.spec | |
| parent | ed5ac450dddfa528eeceeeb1f649c4b8b2146c03 (diff) | |
| parent | 5fa9753104323ef13fe23b6d08fa2ff188be59b1 (diff) | |
| download | kernel-268fd48fcb2ea8b2a0fac8148fa6df88fa43bc43.tar.gz kernel-268fd48fcb2ea8b2a0fac8148fa6df88fa43bc43.tar.xz kernel-268fd48fcb2ea8b2a0fac8148fa6df88fa43bc43.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.20200618git1b5044021070.1.vanilla.1.fc33kernel-5.8.0-0.rc1.20200618git1b5044021070.1.vanilla.1.fc32kernel-5.8.0-0.rc1.20200618git1b5044021070.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 14165c075..233d35daa 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.rc1.20200617git69119673bd50.1 +%global distro_build 0.rc1.20200618git1b5044021070.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.rc1.20200617git69119673bd50.1 +%define pkgrelease 0.rc1.20200618git1b5044021070.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20200617git69119673bd50.1%{?buildid}%{?dist} +%define specrelease 0.rc1.20200618git1b5044021070.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-20200617git69119673bd50.tar.xz +Source0: linux-20200618git1b5044021070.tar.xz Source1: Makefile.rhelver @@ -1281,8 +1281,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200617git69119673bd50 -c -mv linux-20200617git69119673bd50 linux-%{KVERREL} +%setup -q -n kernel-20200618git1b5044021070 -c +mv linux-20200618git1b5044021070 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2787,6 +2787,13 @@ fi # # %changelog +* Thu Jun 18 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200618git1b5044021070.1] +- 1b5044021070 rebase +- redhat/Makefile: Add fedora-configs and rh-configs make targets (Prarit Bhargava) +- Updated changelog for the release based on 69119673bd50 (Fedora Kernel Team) +- redhat/configs: Use SHA512 for module signing (Prarit Bhargava) +- genspec.sh: 'touch' empty Patchlist file for single tarball (Don Zickus) + * Wed Jun 17 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200617git69119673bd50.1] - 69119673bd50 rebase - Updated changelog for the release based on a5dc8300df75 (Fedora Kernel Team) |