diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-01 08:09:30 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-01 08:09:30 +0200 |
| commit | 09914d5820771a28e0f7088127cd3f79700d61df (patch) | |
| tree | 0a614dbd10fcf5785d9f4a3ca8b2c80b0e48c8cb /kernel.spec | |
| parent | 81a483ee7a830b72ed37f36eb56fa581c80b54c3 (diff) | |
| parent | 9e5bb46146bb87601ccec5eea950ffc57e5b7c05 (diff) | |
| download | kernel-09914d5820771a28e0f7088127cd3f79700d61df.tar.gz kernel-09914d5820771a28e0f7088127cd3f79700d61df.tar.xz kernel-09914d5820771a28e0f7088127cd3f79700d61df.zip | |
Merge commit '9e5bb46146bb87601ccec5eea950ffc57e5b7c05' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-60.vanilla.1.fc36kernel-5.14.0-60.vanilla.1.fc35kernel-5.14.0-60.vanilla.1.fc34kernel-5.14.0-60.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
| -rwxr-xr-x | kernel.spec | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index 3905cbcb7..80c8ab91c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -80,7 +80,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc7.20210827git77dd11439b86.57 +%global distro_build 60 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -126,13 +126,14 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 0.rc7.20210827git77dd11439b86.57 +%define patchversion 5.14 +%define pkgrelease 60 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20210827git77dd11439b86.57%{?buildid}%{?dist} +%define specrelease 60%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -673,7 +674,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14-rc7-89-g77dd11439b86.tar.xz +Source0: linux-5.14.tar.xz Source1: Makefile.rhelver @@ -829,7 +830,7 @@ Source4002: gating.yaml %if !%{nopatches} -Patch1: patch-%{rpmversion}-redhat.patch +Patch1: patch-%{patchversion}-redhat.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1359,15 +1360,15 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-rc7-89-g77dd11439b86 -c -mv linux-5.14-rc7-89-g77dd11439b86 linux-%{KVERREL} +%setup -q -n kernel-5.14 -c +mv linux-5.14 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . %if !%{nopatches} -ApplyOptionalPatch patch-%{rpmversion}-redhat.patch +ApplyOptionalPatch patch-%{patchversion}-redhat.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2963,6 +2964,12 @@ fi # # %changelog +* Mon Aug 30 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14-60] +- arm64: use common CONFIG_MAX_ZONEORDER for arm kernel (Mark Salter) + +* Sat Aug 28 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14-0.rc7.20210828git64b4fc45bea6.58] +- Create Makefile.variables for a single point of configuration change (Justin M. Forbes) + * Fri Aug 27 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.14.0-0.rc7.20210827git77dd11439b86.57] - rpmspec: drop traceevent files instead of just excluding them from files list (Herton R. Krzesinski) [1967640] - Revert "redhat/configs: Enable genet and brcmfmac wlan" (Íñigo Huguet) |