diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-08 20:22:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-08 20:22:57 +0200 |
commit | cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc (patch) | |
tree | 76c7a9adce32be941e4cf841768425b24eb4195b /kernel.spec | |
parent | 47111b1550f53891a058d280f717324833da0e82 (diff) | |
parent | 1f73373523ba55640127732eb7520325c8929b4c (diff) | |
download | kernel-cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc.tar.gz kernel-cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc.tar.xz kernel-cc7181fc13a9960b07cfd2d4d96b6da20b6be3bc.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc4.20200508git79dede78c057.1.vanilla.1.fc33kernel-5.7.0-0.rc4.20200508git79dede78c057.1.vanilla.1.fc32kernel-5.7.0-0.rc4.20200508git79dede78c057.1.vanilla.1.fc31kernel-5.7.0-0.rc4.20200508git79dede78c057.1.vanilla.1.fc30
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec index 819fd5300..4e0a1fc45 100644 --- a/kernel.spec +++ b/kernel.spec @@ -30,7 +30,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 0.rc4.20200507gita811c1fa0a02.1 +%global distro_build 0.rc4.20200508git79dede78c057.1 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -71,10 +71,10 @@ Summary: The Linux kernel %endif %define rpmversion 5.7.0 -%define pkgrelease 0.rc4.20200507gita811c1fa0a02.1 +%define pkgrelease 0.rc4.20200508git79dede78c057.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20200507gita811c1fa0a02.1%{?buildid}%{?dist} +%define specrelease 0.rc4.20200508git79dede78c057.1%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -566,7 +566,7 @@ BuildRequires: asciidoc # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-20200507gita811c1fa0a02.tar.xz +Source0: linux-20200508git79dede78c057.tar.xz Source1: Makefile.rhelver @@ -1275,8 +1275,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200507gita811c1fa0a02 -c -mv linux-20200507gita811c1fa0a02 linux-%{KVERREL} +%setup -q -n kernel-20200508git79dede78c057 -c +mv linux-20200508git79dede78c057 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2765,6 +2765,10 @@ fi # # %changelog +* Fri May 08 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200508git79dede78c057.1] +- 79dede78c057 rebase +- Updated changelog for the release based on a811c1fa0a02 ("CKI@GitLab") + * Thu May 07 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc4.20200507gita811c1fa0a02.1] - a811c1fa0a02 rebase - perf cs-etm: Move defined of traceid_list (Leo Yan) |