diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-28 17:46:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2022-03-28 17:46:56 +0200 |
commit | 05b5f9ce7d79962301c80f2140b6b75fddc300a8 (patch) | |
tree | 1655d27dd3729fdc47b3b9d9f4eb7357446f9cfa /kernel.spec | |
parent | 0c0c7c8b88aa7f4c290768517b62c408816b9396 (diff) | |
parent | bcf6d6313b28d73341a302d0657b7c90d298b9cc (diff) | |
download | kernel-05b5f9ce7d79962301c80f2140b6b75fddc300a8.tar.gz kernel-05b5f9ce7d79962301c80f2140b6b75fddc300a8.tar.xz kernel-05b5f9ce7d79962301c80f2140b6b75fddc300a8.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.18.0-0.rc0.20220328gitae085d7f9365.10.vanilla.1.fc37kernel-5.18.0-0.rc0.20220328gitae085d7f9365.10.vanilla.1.fc36kernel-5.18.0-0.rc0.20220328gitae085d7f9365.10.vanilla.1.fc35kernel-5.18.0-0.rc0.20220328gitae085d7f9365.10.vanilla.1.fc34
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index fa1a5a21a..de9d0e907 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.20220325git34af78c4e616.7 +%global distro_build 0.rc0.20220328gitae085d7f9365.10 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -134,13 +134,13 @@ Summary: The Linux kernel %define rpmversion 5.18.0 %define patchversion 5.18 -%define pkgrelease 0.rc0.20220325git34af78c4e616.7 +%define pkgrelease 0.rc0.20220328gitae085d7f9365.10 # This is needed to do merge window version magic %define patchlevel 18 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20220325git34af78c4e616.7%{?buildid}%{?dist} +%define specrelease 0.rc0.20220328gitae085d7f9365.10%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -700,7 +700,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.17-9727-g34af78c4e616.tar.xz +Source0: linux-5.17-11407-gae085d7f9365.tar.xz Source1: Makefile.rhelver @@ -1396,8 +1396,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.17-9727-g34af78c4e616 -c -mv linux-5.17-9727-g34af78c4e616 linux-%{KVERREL} +%setup -q -n kernel-5.17-11407-gae085d7f9365 -c +mv linux-5.17-11407-gae085d7f9365 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -3028,10 +3028,18 @@ fi # # %changelog -* Fri Mar 25 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18-0.rc0.34af78c4e616.6] +* Mon Mar 28 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.ae085d7f9365.9] - Avoid creating files in $RPM_SOURCE_DIR (Nicolas Chauvet) - mm/sparsemem: Fix 'mem_section' will never be NULL gcc 12 warning (Waiman Long) +* Sat Mar 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18.0-0.rc0.52d543b5497c.6] +- Fedora config updates to fix process_configs (Justin M. Forbes) +- redhat: Fix release tagging (Prarit Bhargava) +- redhat/self-test: Fix version tag test (Prarit Bhargava) +- redhat/self-test: Fix BUILD verification test (Prarit Bhargava) +- redhat/self-test: Cleanup SRPM related self-tests (Prarit Bhargava) +- redhat/self-test: Fix shellcheck test (Prarit Bhargava) + * Fri Mar 25 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.18-0.rc0.34af78c4e616.5] - redhat/configs: Disable watchdog components (Prarit Bhargava) - redhat/README.Makefile: Add a Makefile README file (Prarit Bhargava) |