diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-05 17:08:36 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-04-05 17:08:36 +0200 |
commit | 3bb63fa7872e911bdf13d1822719f83310fab24d (patch) | |
tree | 16cda2d87b087bb35eca65fffed9df1f7e1f9335 /kernel.spec | |
parent | 26eb46adb81a7aad4536e803cbb8b937d1e4d135 (diff) | |
parent | c918bd768aa916cb376b54354b0753903a1a18b5 (diff) | |
download | kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.gz kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.tar.xz kernel-3bb63fa7872e911bdf13d1822719f83310fab24d.zip |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.12.0-0.rc6.184.vanilla.1.fc35kernel-5.12.0-0.rc6.184.vanilla.1.fc34kernel-5.12.0-0.rc6.184.vanilla.1.fc33kernel-5.12.0-0.rc6.184.vanilla.1.fc32
Diffstat (limited to 'kernel.spec')
-rwxr-xr-x | kernel.spec | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 4c158a715..8bb311b31 100755 --- a/kernel.spec +++ b/kernel.spec @@ -66,7 +66,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc5.20210331git2bb25b3a748a.181 +%global distro_build 0.rc6.184 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -109,13 +109,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.12.0 -%define pkgrelease 0.rc5.20210331git2bb25b3a748a.181 +%define pkgrelease 0.rc6.184 # This is needed to do merge window version magic %define patchlevel 12 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20210331git2bb25b3a748a.181%{?buildid}%{?dist} +%define specrelease 0.rc6.184%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -622,7 +622,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20210331git2bb25b3a748a.tar.xz +Source0: linux-5.12-rc6.tar.xz Source1: Makefile.rhelver @@ -1277,8 +1277,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20210331git2bb25b3a748a -c -mv linux-20210331git2bb25b3a748a linux-%{KVERREL} +%setup -q -n kernel-5.12-rc6 -c +mv linux-5.12-rc6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . |