diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-30 17:31:55 +0200 |
commit | e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a (patch) | |
tree | 724e53ad8d5c0f42dc98ddc9e9ab1f39e1e3c542 /kernel.spec | |
parent | 7b32641801900ee7e32065b436d7318c5d7a972e (diff) | |
parent | d176dfce22f5ead7a6018edb69757bc8840cc008 (diff) | |
download | kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.gz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.tar.xz kernel-e11be5e9f76f0b54aa2a38b67b3cf193a0dfae9a.zip |
merge origin
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 4393d8e29..f54c22395 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.rc3.1 +%global distro_build 0.rc3.20200630git7c30b859a947.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.rc3.1 +%define pkgrelease 0.rc3.20200630git7c30b859a947.1 # This is needed to do merge window version magic %define patchlevel 8 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.1%{?buildid}%{?dist} +%define specrelease 0.rc3.20200630git7c30b859a947.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-rc3.tar.xz +Source0: linux-20200630git7c30b859a947.tar.xz Source1: Makefile.rhelver @@ -1282,8 +1282,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.8-rc3 -c -mv linux-5.8-rc3 linux-%{KVERREL} +%setup -q -n kernel-20200630git7c30b859a947 -c +mv linux-20200630git7c30b859a947 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2794,6 +2794,10 @@ fi # # %changelog +* Tue Jun 30 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.20200630git7c30b859a947.1] +- 7c30b859a947 rebase +- Updated changelog for the release based on v5.8-rc3 (Fedora Kernel Team) + * Mon Jun 29 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc3.1] - v5.8-rc3 rebase - s390x-zfcpdump: Handle missing Module.symvers file (Don Zickus) |