diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-19 07:05:19 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-10-19 07:05:19 +0200 |
commit | 5e24b7da354d3e15954d6c12ec594f66bd7a1d42 (patch) | |
tree | 47554a573b4989fc51199072896504b5330340c1 /kernel.spec | |
parent | b9009d4d2130dc503c74f39e66698702edc6c29a (diff) | |
parent | 9d0424b3fb5582d1f8d097b75c222be850225253 (diff) | |
download | kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.tar.gz kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.tar.xz kernel-5e24b7da354d3e15954d6c12ec594f66bd7a1d42.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.15.0-0.rc6.47.vanilla.1.fc36kernel-5.15.0-0.rc6.47.vanilla.1.fc35kernel-5.15.0-0.rc6.47.vanilla.1.fc34kernel-5.15.0-0.rc6.47.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 8a6552e20..eb28fe4a1 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc5.20211015gitec681c53f8d2.44 +%global distro_build 0.rc6.47 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.15.0 %define patchversion 5.15 -%define pkgrelease 0.rc5.20211015gitec681c53f8d2.44 +%define pkgrelease 0.rc6.47 # This is needed to do merge window version magic %define patchlevel 15 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20211015gitec681c53f8d2.44%{?buildid}%{?dist} +%define specrelease 0.rc6.47%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -681,7 +681,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.15-rc5-126-gec681c53f8d2.tar.xz +Source0: linux-5.15-rc6.tar.xz Source1: Makefile.rhelver @@ -1372,8 +1372,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.15-rc5-126-gec681c53f8d2 -c -mv linux-5.15-rc5-126-gec681c53f8d2 linux-%{KVERREL} +%setup -q -n kernel-5.15-rc6 -c +mv linux-5.15-rc6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2976,7 +2976,7 @@ fi # # %changelog -* Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.44] +* Mon Oct 18 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc6.47] - Temporarily turn off selftests for bpf on ppc (Justin M. Forbes) * Fri Oct 15 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.15-0.rc5.20211015gitec681c53f8d2.43] |