diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-03 07:22:57 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-03 07:22:57 +0100 |
commit | 81780ae21e6d75a2e29f24cf6b25025c729e0219 (patch) | |
tree | 8420628ae858a36537d2bf7530cbb14b63350197 /kernel.spec | |
parent | 4d696d66219ccc8002d7096b10c8b5f2763d819f (diff) | |
parent | 6c1abf676776bc0233d9952a95eca64018a13a39 (diff) | |
download | kernel-81780ae21e6d75a2e29f24cf6b25025c729e0219.tar.gz kernel-81780ae21e6d75a2e29f24cf6b25025c729e0219.tar.xz kernel-81780ae21e6d75a2e29f24cf6b25025c729e0219.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc6.20220302gitfb184c4af9b9.111.vanilla.1.fc35
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 1577e31bb..01bff2813 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # Set debugbuildsenabled to 0 to not build a separate debug kernel, but # to build the base kernel using the debug configuration. (Specifying # the --with-release option overrides this setting.) -%define debugbuildsenabled 1 +%define debugbuildsenabled 0 -%global distro_build 0.rc6.109 +%global distro_build 0.rc6.20220302gitfb184c4af9b9.111 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.17.0 %define patchversion 5.17 -%define pkgrelease 0.rc6.109 +%define pkgrelease 0.rc6.20220302gitfb184c4af9b9.111 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.109%{?buildid}%{?dist} +%define specrelease 0.rc6.20220302gitfb184c4af9b9.111%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -697,7 +697,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-rc6.tar.xz +Source0: linux-5.17-rc6-54-gfb184c4af9b9.tar.xz Source1: Makefile.rhelver @@ -1393,8 +1393,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-rc6 -c -mv linux-5.17-rc6 linux-%{KVERREL} +%setup -q -n kernel-5.17-rc6-54-gfb184c4af9b9 -c +mv linux-5.17-rc6-54-gfb184c4af9b9 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3011,12 +3011,15 @@ fi # # %changelog -* Mon Feb 28 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-0.rc6.109] -- Build CROS_EC Modules (Jason Montleon) - -* Mon Feb 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.109] +* Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.111] - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Wed Mar 02 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.fb184c4af9b9.110] +- redhat: Fix "make dist-release-finish" to use the correct NVR variables (Neal Gompa) [2053836] + +* Tue Mar 01 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.719fce7539cd.109] +- Build CROS_EC Modules (Jason Montleon) + * Mon Feb 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc6.108] - redhat: configs: change aarch64 default dma domain to lazy (Jerry Snitselaar) - redhat: configs: disable ATM protocols (Davide Caratti) |