diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-07 17:29:22 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-07 17:29:22 +0200 |
commit | 8300a915b00ec5032f746b77099c8b0b49966bc6 (patch) | |
tree | af784a1e4958c654da3d8aa25a2b4a9865a44505 /kernel.spec | |
parent | 48a66577977639b4d82b6b83af3e2bb6e471784c (diff) | |
parent | c287bb277918989b1f55770cff748e17b940ff21 (diff) | |
download | kernel-8300a915b00ec5032f746b77099c8b0b49966bc6.tar.gz kernel-8300a915b00ec5032f746b77099c8b0b49966bc6.tar.xz kernel-8300a915b00ec5032f746b77099c8b0b49966bc6.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc0.20210907git4b93c544e90e.6.vanilla.1.fc36kernel-5.15.0-0.rc0.20210907git4b93c544e90e.6.vanilla.1.fc35kernel-5.15.0-0.rc0.20210907git4b93c544e90e.6.vanilla.1.fc34kernel-5.15.0-0.rc0.20210907git4b93c544e90e.6.vanilla.1.fc33
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kernel.spec b/kernel.spec index fc47faece..a8baf3250 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.rc0.20210902git4ac6d90867a4.4 +%global distro_build 0.rc0.20210907git4b93c544e90e.6 %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.rc0.20210902git4ac6d90867a4.4 +%define pkgrelease 0.rc0.20210907git4b93c544e90e.6 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210902git4ac6d90867a4.4%{?buildid}%{?dist} +%define specrelease 0.rc0.20210907git4b93c544e90e.6%{?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.14-7693-g4ac6d90867a4.tar.xz +Source0: linux-5.14-9718-g4b93c544e90e.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-7693-g4ac6d90867a4 -c -mv linux-5.14-7693-g4ac6d90867a4 linux-%{KVERREL} +%setup -q -n kernel-5.14-9718-g4b93c544e90e -c +mv linux-5.14-9718-g4b93c544e90e linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,7 +2964,7 @@ fi # # %changelog -* Thu Sep 02 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210902git4ac6d90867a4.4] +* Tue Sep 07 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210907git4b93c544e90e.6] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) * Tue Aug 31 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210831gitb91db6a0b52e.1] |