diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-11 15:49:18 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-11 15:49:18 +0100 |
| commit | 91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c (patch) | |
| tree | 7fd1ca24529b6bedb5cd0f0e84fa9bc5eb62122b /kernel.spec | |
| parent | 8cf6d85c634afb1792e9061fb45bdda1ef996b1d (diff) | |
| parent | 1dfc57d4e143527f241903975502b52dd2bfbafb (diff) | |
| download | kernel-91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c.tar.gz kernel-91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c.tar.xz kernel-91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c.zip | |
merge master (5.11-rc3)kernel-5.11.0-0.rc3.122.vanilla.1.fc34kernel-5.11.0-0.rc3.122.vanilla.1.fc33kernel-5.11.0-0.rc3.122.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 0c79e804d..b2b0eeca7 100755 --- 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.20210108gitf5e6c330254a.119 +%global distro_build 0.rc3.122 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -99,13 +99,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc2.20210108gitf5e6c330254a.119 +%define pkgrelease 0.rc3.122 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210108gitf5e6c330254a.119%{?buildid}%{?dist} +%define specrelease 0.rc3.122%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -508,7 +508,7 @@ BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc, bison, flex, gcc-c++ BuildRequires: net-tools, hostname, bc, elfutils-devel BuildRequires: dwarves BuildRequires: python3-devel -BuildRequires: gcc-plugin-devel, gcc-c++ +BuildRequires: gcc-plugin-devel %if %{with_headers} BuildRequires: rsync %endif @@ -594,7 +594,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210108gitf5e6c330254a.tar.xz +Source0: linux-5.11-rc3.tar.xz Source1: Makefile.rhelver @@ -1241,8 +1241,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210108gitf5e6c330254a -c -mv linux-20210108gitf5e6c330254a linux-%{KVERREL} +%setup -q -n kernel-5.11-rc3 -c +mv linux-5.11-rc3 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2724,10 +2724,13 @@ fi # # %changelog -* Fri Jan 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210108gitf5e6c330254a.119] +* Mon Jan 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc3.122] - irq: export irq_check_status_bit (Levi Yun) - Turn off vdso_install for ppc ("Justin M. Forbes") +* Sat Jan 09 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210109git996e435fd401.119] +- Revert "Merge branch 'revert-29a48502' into 'os-build'" (Justin Forbes) + * Fri Jan 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc2.20210108gitf5e6c330254a.118] - Fedora: arm updates for 5.11 and general cross Fedora cleanups (Peter Robinson) |