diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-14 18:54:12 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-01-14 18:54:12 +0100 |
commit | 2a06bd9ee06622de1f65b1313546ae3d9bafdf56 (patch) | |
tree | 2781dc56413b52488080468c8ca36706114826e9 /kernel.spec | |
parent | 734a3e284524afdd5f5cb462ce05eee09301f9ee (diff) | |
parent | 99f01811cec01dfb86a107a6a4134836b476c554 (diff) | |
download | kernel-2a06bd9ee06622de1f65b1313546ae3d9bafdf56.tar.gz kernel-2a06bd9ee06622de1f65b1313546ae3d9bafdf56.tar.xz kernel-2a06bd9ee06622de1f65b1313546ae3d9bafdf56.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.17.0-0.rc0.20220114gitfb3b0673b7d5.65.vanilla.1.fc36kernel-5.17.0-0.rc0.20220114gitfb3b0673b7d5.65.vanilla.1.fc35kernel-5.17.0-0.rc0.20220114gitfb3b0673b7d5.65.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec index feb262ada..c18cfa06c 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc0.20220113git455e73a07f6e.64 +%global distro_build 0.rc0.20220114gitfb3b0673b7d5.65 %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.rc0.20220113git455e73a07f6e.64 +%define pkgrelease 0.rc0.20220114gitfb3b0673b7d5.65 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220113git455e73a07f6e.64%{?buildid}%{?dist} +%define specrelease 0.rc0.20220114gitfb3b0673b7d5.65%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -694,7 +694,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.16-8050-g455e73a07f6e.tar.xz +Source0: linux-5.16-8301-gfb3b0673b7d5.tar.xz Source1: Makefile.rhelver @@ -1388,8 +1388,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.16-8050-g455e73a07f6e -c -mv linux-5.16-8050-g455e73a07f6e linux-%{KVERREL} +%setup -q -n kernel-5.16-8301-gfb3b0673b7d5 -c +mv linux-5.16-8301-gfb3b0673b7d5 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2990,10 +2990,12 @@ fi # # %changelog -* Thu Jan 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220113git455e73a07f6e.64] -- Add dev_addr_lists_test to mod-internal.list (Justin M. Forbes) +* Fri Jan 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220114gitfb3b0673b7d5.65] - lib/crypto: add prompts back to crypto libraries (Justin M. Forbes) +* Fri Jan 14 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220114gitfb3b0673b7d5.64] +- Add dev_addr_lists_test to mod-internal.list (Justin M. Forbes) + * Thu Jan 13 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.17-0.rc0.20220113git455e73a07f6e.63] - configs/fedora: Enable CONFIG_NFC_PN532_UART for use PN532 NFC module (Ziqian SUN (Zamir)) |