diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:12 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-23 18:16:12 +0100 |
| commit | 72db8379fd80a62629d21f26b9e9ee9c90ca413d (patch) | |
| tree | 20db9b036bb1ba3707c4a1d759a66918ed7bb85f /kernel.spec | |
| parent | d17259e62379cc156675b9cf903e6cfdf677a27e (diff) | |
| parent | 07ebe84e7e31faaf69c3ffbc7306dee6ff657b6c (diff) | |
| download | kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.tar.gz kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.tar.xz kernel-72db8379fd80a62629d21f26b9e9ee9c90ca413d.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc5.82.vanilla.1.fc34kernel-5.10.0-0.rc5.82.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec index 6a042b904..cd8e79db9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.20201119gitc2e7554e1b85.81 +%global distro_build 0.rc5.82 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -97,13 +97,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.10.0 -%define pkgrelease 0.rc4.20201119gitc2e7554e1b85.81 +%define pkgrelease 0.rc5.82 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20201119gitc2e7554e1b85.81%{?buildid}%{?dist} +%define specrelease 0.rc5.82%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -536,7 +536,7 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -BuildRequires: llvm +BuildRequires: clang llvm %ifnarch %{arm} BuildRequires: numactl-devel %endif @@ -594,7 +594,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201119gitc2e7554e1b85.tar.xz +Source0: linux-5.10-rc5.tar.xz Source1: Makefile.rhelver @@ -1238,8 +1238,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201119gitc2e7554e1b85 -c -mv linux-20201119gitc2e7554e1b85 linux-%{KVERREL} +%setup -q -n kernel-5.10-rc5 -c +mv linux-5.10-rc5 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2681,8 +2681,9 @@ fi # # %changelog -* Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.80] -- No need to review, Temporary workarounds due to DEBUG_INFO_BTF not working ("Justin M. Forbes") +* Fri Nov 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201120git4d02da974ea8.81] +- Fedora config update ("Justin M. Forbes") +- redhat: generic enable CONFIG_INET_MPTCP_DIAG (Davide Caratti) * Thu Nov 19 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc4.20201119gitc2e7554e1b85.79.test] - c2e7554e1b85 rebase |