diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-14 17:15:02 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-06-14 17:15:02 +0200 |
commit | 70729eacc5c9a469a47f4ef95dc4791610da5ba3 (patch) | |
tree | 6936cf3e47b073c0b89480c819754b41b654fba7 /kernel.spec | |
parent | b79be72136753867801d4f5e16521e47ad4766f1 (diff) | |
parent | 3f959c002269fe54c63be8883744c5ea7682797b (diff) | |
download | kernel-70729eacc5c9a469a47f4ef95dc4791610da5ba3.tar.gz kernel-70729eacc5c9a469a47f4ef95dc4791610da5ba3.tar.xz kernel-70729eacc5c9a469a47f4ef95dc4791610da5ba3.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.13.0-0.rc6.45.vanilla.1.fc35kernel-5.13.0-0.rc6.45.vanilla.1.fc34kernel-5.13.0-0.rc6.45.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 900860fec..83d17c947 100755 --- a/kernel.spec +++ b/kernel.spec @@ -73,7 +73,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 0.rc5.20210611git929d931f2b40.42 +%global distro_build 0.rc6.45 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -119,13 +119,13 @@ Summary: The Linux kernel %define kversion 5.13 %define rpmversion 5.13.0 -%define pkgrelease 0.rc5.20210611git929d931f2b40.42 +%define pkgrelease 0.rc6.45 # This is needed to do merge window version magic %define patchlevel 13 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210611git929d931f2b40.42%{?buildid}%{?dist} +%define specrelease 0.rc6.45%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -652,7 +652,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13-rc5-110-g929d931f2b40.tar.xz +Source0: linux-5.13-rc6.tar.xz Source1: Makefile.rhelver @@ -1321,8 +1321,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13-rc5-110-g929d931f2b40 -c -mv linux-5.13-rc5-110-g929d931f2b40 linux-%{KVERREL} +%setup -q -n kernel-5.13-rc6 -c +mv linux-5.13-rc6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2879,7 +2879,7 @@ fi # # %changelog -* Fri Jun 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210611git929d931f2b40.42] +* Mon Jun 14 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc6.45] - Revert "powerpc: Switch to relative jump labels" (Don Zickus) - spec: Enable sefltests rpm build (Jiri Olsa) - spec: Allow bpf selftest/samples to fail (Jiri Olsa) |