diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-23 21:29:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-23 21:29:16 +0200 |
commit | 03e4dbd1091e6f4c2137b241f35d5dec6d19f3ef (patch) | |
tree | e0d87abc9739b65b0fcf17ca481a662c8f12fea5 /kernel.spec | |
parent | 0eca359ba5b83140f5ef12a50e30693fd6e65a01 (diff) | |
parent | 10db88dce39460ae36eae6aca8487995a407a5e4 (diff) | |
download | kernel-03e4dbd1091e6f4c2137b241f35d5dec6d19f3ef.tar.gz kernel-03e4dbd1091e6f4c2137b241f35d5dec6d19f3ef.tar.xz kernel-03e4dbd1091e6f4c2137b241f35d5dec6d19f3ef.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc2.20210923git58e2cf5d7946.21.vanilla.1.fc36kernel-5.15.0-0.rc2.20210923git58e2cf5d7946.21.vanilla.1.fc35kernel-5.15.0-0.rc2.20210923git58e2cf5d7946.21.vanilla.1.fc34kernel-5.15.0-0.rc2.20210923git58e2cf5d7946.21.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index abbb7fb9f..0a0df7afe 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.rc2.20210922git92477dd1faa6.20 +%global distro_build 0.rc2.20210923git58e2cf5d7946.21 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -127,13 +127,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc2.20210922git92477dd1faa6.20 +%define pkgrelease 0.rc2.20210923git58e2cf5d7946.21 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20210922git92477dd1faa6.20%{?buildid}%{?dist} +%define specrelease 0.rc2.20210923git58e2cf5d7946.21%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -674,7 +674,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc2-32-g92477dd1faa6.tar.xz +Source0: linux-5.15-rc2-51-g58e2cf5d7946.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc2-32-g92477dd1faa6 -c -mv linux-5.15-rc2-32-g92477dd1faa6 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc2-51-g58e2cf5d7946 -c +mv linux-5.15-rc2-51-g58e2cf5d7946 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,6 +2964,9 @@ fi # # %changelog +* Thu Sep 23 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc2.20210923git58e2cf5d7946.21] +- redhat/configs: enable CONFIG_SQUASHFS_ZSTD which is already enabled in Fedora 34 (Tao Liu) [1998953] + * Sat Sep 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.20210918git4357f03d6611.16] - redhat: bump RHEL_MAJOR and add the changelog file for it (Herton R. Krzesinski) - redhat: add documentation about the os-build rebase process (Herton R. Krzesinski) |