diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-16 20:19:32 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-16 20:19:32 +0200 |
commit | 172d6ff8046b82618aafb5b36961633b27a3d476 (patch) | |
tree | c73ead0f3c3a6c971d04373f87eade1015c2ee8d /kernel.spec | |
parent | d0b8941357b7ce0c26d19376bc4d827042d6bb12 (diff) | |
parent | 3167599aa0bc477a28c595d6ba78bd6bcb8b7cef (diff) | |
download | kernel-172d6ff8046b82618aafb5b36961633b27a3d476.tar.gz kernel-172d6ff8046b82618aafb5b36961633b27a3d476.tar.xz kernel-172d6ff8046b82618aafb5b36961633b27a3d476.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.20200616gita5dc8300df75.1.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index c79b8aecc..1fb003cc6 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.1 +%global distro_build 0.rc1.20200616gita5dc8300df75.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.1 +%define pkgrelease 0.rc1.20200616gita5dc8300df75.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.1%{?buildid}%{?dist} +%define specrelease 0.rc1.20200616gita5dc8300df75.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -168,7 +168,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 # The kernel tarball/base version %define kversion 5.8 @@ -569,7 +569,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.8-rc1.tar.xz +Source0: linux-20200616gita5dc8300df75.tar.xz Source1: Makefile.rhelver @@ -1281,8 +1281,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.8-rc1 -c -mv linux-5.8-rc1 linux-%{KVERREL} +%setup -q -n kernel-20200616gita5dc8300df75 -c +mv linux-20200616gita5dc8300df75 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2787,8 +2787,10 @@ fi # # %changelog -* Sun Jun 14 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc1.1] +* Tue Jun 16 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200616gita5dc8300df75.1] +- a5dc8300df75 rebase - Fedora config update for rc1 ("Justin M. Forbes") +- Updated changelog for the release based on v5.8-rc1 (Fedora Kernel Team) * Sun Jun 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.1] - v5.8-rc1 rebase |