diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-29 18:09:05 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-12-29 18:09:05 +0100 |
commit | d656fcc48d8b13a41be16c7ec477c1f9a0c0d806 (patch) | |
tree | 51beb316dc4cec287b1b58d02cce4418080f4f2c /kernel.spec | |
parent | 4d0e54bbc16207a52d9e6ccd3e0b0677a9fd6720 (diff) | |
parent | a260e87234a27da05e103107d33f3f47bde88d04 (diff) | |
download | kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.tar.gz kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.tar.xz kernel-d656fcc48d8b13a41be16c7ec477c1f9a0c0d806.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.vanilla.1.fc34kernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.vanilla.1.fc33kernel-5.11.0-0.rc1.20201229gitdea8dcf2a9fa.109.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 da243f1ad..7bc23fbec 100755 --- a/kernel.spec +++ b/kernel.spec @@ -56,7 +56,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc0.20201223git614cb5894306.107 +%global distro_build 0.rc1.20201229gitdea8dcf2a9fa.109 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -99,13 +99,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.11.0 -%define pkgrelease 0.rc0.20201223git614cb5894306.107 +%define pkgrelease 0.rc1.20201229gitdea8dcf2a9fa.109 # This is needed to do merge window version magic %define patchlevel 11 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20201223git614cb5894306.107%{?buildid}%{?dist} +%define specrelease 0.rc1.20201229gitdea8dcf2a9fa.109%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -593,7 +593,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20201223git614cb5894306.tar.xz +Source0: linux-20201229gitdea8dcf2a9fa.tar.xz Source1: Makefile.rhelver @@ -1237,8 +1237,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20201223git614cb5894306 -c -mv linux-20201223git614cb5894306 linux-%{KVERREL} +%setup -q -n kernel-20201229gitdea8dcf2a9fa -c +mv linux-20201229gitdea8dcf2a9fa linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . |