diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-09 16:56:56 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-11-09 16:56:56 +0100 |
| commit | a223d454774cc181f1229969af0895d9242ffb50 (patch) | |
| tree | 47d5c262a600e335d3091e16149ba08dbd398a91 /kernel.spec | |
| parent | 8bd56f5ba16e087a94f205379d55ed7d5a6d8c4e (diff) | |
| parent | f7a31ded5be91f48f8476388828d97ac5f8f8ca9 (diff) | |
| download | kernel-a223d454774cc181f1229969af0895d9242ffb50.tar.gz kernel-a223d454774cc181f1229969af0895d9242ffb50.tar.xz kernel-a223d454774cc181f1229969af0895d9242ffb50.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.10.0-0.rc3.68.vanilla.1.fc34kernel-5.10.0-0.rc3.68.vanilla.1.fc33kernel-5.10.0-0.rc3.68.vanilla.1.fc32kernel-5.10.0-0.rc3.68.vanilla.1.fc31
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index 519d335b0..86c909664 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.rc2.20201105git4ef8451b3326.64 +%global distro_build 0.rc3.68 %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.rc2.20201105git4ef8451b3326.64 +%define pkgrelease 0.rc3.68 # This is needed to do merge window version magic %define patchlevel 10 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20201105git4ef8451b3326.64%{?buildid}%{?dist} +%define specrelease 0.rc3.68%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -536,7 +536,7 @@ BuildRequires: python3-docutils BuildRequires: zlib-devel binutils-devel %endif %if %{with_selftests} -BuildRequires: clang llvm +BuildRequires: 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-20201105git4ef8451b3326.tar.xz +Source0: linux-5.10-rc3.tar.xz Source1: Makefile.rhelver @@ -1238,8 +1238,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201105git4ef8451b3326 -c -mv linux-20201105git4ef8451b3326 linux-%{KVERREL} +%setup -q -n kernel-5.10-rc3 -c +mv linux-5.10-rc3 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2681,6 +2681,22 @@ fi # # %changelog +* Mon Nov 09 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.10.0-0.rc3.68] +- Fedora 5.10 config updates ("Justin M. Forbes") + +* Mon Nov 09 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc3.66.test] +- v5.10-rc3 rebase + +* Sun Nov 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.20201108git4429f14aeea9.65.test] +- 4429f14aeea9 rebase + +* Sat Nov 07 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.20201107git659caaf65dc9.64.test] +- 659caaf65dc9 rebase + +* Fri Nov 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.20201106git521b619acdc8.63.test] +- 521b619acdc8 rebase +- Fedora 5.10 configs round 1 ("Justin M. Forbes") + * Wed Nov 04 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.10.0-0.rc2.20201104git4ef8451b3326.62.test] - 4ef8451b3326 rebase |