diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-05 21:59:30 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-05 21:59:30 +0200 |
| commit | a370e206b17a4b1e64f9d53e12a9c78829cbbd66 (patch) | |
| tree | 0aec228778c49ce58dd6938793904902cf432d5e /kernel.spec | |
| parent | fb8f64b7716fe6d20a7b0f0347f4706dd535146e (diff) | |
| parent | 4fdfe982aedc1556d7754a55d2515f754d2b2e7d (diff) | |
| download | kernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.tar.gz kernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.tar.xz kernel-a370e206b17a4b1e64f9d53e12a9c78829cbbd66.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc4.20200505git47cf1b422e60.1.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/kernel.spec b/kernel.spec index 795ce77ad..6191cd1fe 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.rc4.1 +%global distro_build 0.rc4.20200505git47cf1b422e60.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc4.1 +%define pkgrelease 0.rc4.20200505git47cf1b422e60.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.1%{?buildid}%{?dist} +%define specrelease 0.rc4.20200505git47cf1b422e60.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -165,7 +165,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.7 @@ -508,10 +508,10 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -%if 0%{?fedora} -BuildRequires: clang llvm -%else +%if 0%{?el8} BuildRequires: llvm-toolset +%else +BuildRequires: clang llvm %endif %ifnarch %{arm} BuildRequires: numactl-devel @@ -570,7 +570,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.7-rc4.tar.xz +Source0: linux-20200505git47cf1b422e60.tar.xz Source1: Makefile.rhelver @@ -1278,8 +1278,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.7-rc4 -c -mv linux-5.7-rc4 linux-%{KVERREL} +%setup -q -n kernel-20200505git47cf1b422e60 -c +mv linux-20200505git47cf1b422e60 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2767,6 +2767,11 @@ fi # # %changelog +* Tue May 05 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200505git47cf1b422e60.1] +- 47cf1b422e60 rebase +- Build ARK against ELN (Don Zickus) +- Updated changelog for the release based on v5.7-rc4 ("CKI@GitLab") + * Mon May 04 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.1] - v5.7-rc4 rebase - Updated changelog for the release based on f66ed1ebbfde ("CKI@GitLab") |