diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-14 07:46:08 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-09-14 07:46:08 +0200 |
commit | 9cd7866304b2d5b845de31768b54f7effb5996a7 (patch) | |
tree | 9ce820144f6942d4414b3b77864d5c4554e0cf73 /kernel.spec | |
parent | ae00f5031ceab9a92fc5b2a8acf15093b601ed1f (diff) | |
parent | cc9d1aabf0c139c531b0d301bfbfb39d9dd5d7d2 (diff) | |
download | kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.tar.gz kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.tar.xz kernel-9cd7866304b2d5b845de31768b54f7effb5996a7.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc1.12.vanilla.1.fc36kernel-5.15.0-0.rc1.12.vanilla.1.fc35kernel-5.15.0-0.rc1.12.vanilla.1.fc34kernel-5.15.0-0.rc1.12.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 c18e7351d..9a0fd490f 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.20210910gitbf9f243f23e6.9 +%global distro_build 0.rc1.12 %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.20210910gitbf9f243f23e6.9 +%define pkgrelease 0.rc1.12 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20210910gitbf9f243f23e6.9%{?buildid}%{?dist} +%define specrelease 0.rc1.12%{?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-10807-gbf9f243f23e6.tar.xz +Source0: linux-5.15-rc1.tar.xz Source1: Makefile.rhelver @@ -1360,8 +1360,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14-10807-gbf9f243f23e6 -c -mv linux-5.14-10807-gbf9f243f23e6 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc1 -c +mv linux-5.15-rc1 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2964,7 +2964,7 @@ fi # # %changelog -* Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.9] +* Mon Sep 13 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc1.12] - Temporarily stop building perf with LIBBPF_DYNAMIC=1 (Justin M. Forbes) * Fri Sep 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc0.20210910gitbf9f243f23e6.8] |