diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-22 06:57:19 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-22 06:57:19 +0200 |
commit | 5121229c1d71e5103d84e445a100b9808d6056e1 (patch) | |
tree | eee6516c439989db80337d56211215faa770105f | |
parent | a75753d4bf0e52a515eac7037cd3b43dc69278ca (diff) | |
parent | eeafa0d7a222249ebfc318884c6d52da7cec84bc (diff) | |
download | kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc32.tar.gz kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc32.tar.xz kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc32.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc33kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc32kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc31kernel-5.7.0-0.rc6.20200521gitb85051e755b0.1.vanilla.1.fc30
-rw-r--r-- | kernel.spec | 16 | ||||
-rw-r--r-- | sources | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 52dd6841c..c148fe92f 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.rc6.20200520git115a54162a6c.1 +%global distro_build 0.rc6.20200521gitb85051e755b0.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.rc6.20200520git115a54162a6c.1 +%define pkgrelease 0.rc6.20200521gitb85051e755b0.1 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20200520git115a54162a6c.1%{?buildid}%{?dist} +%define specrelease 0.rc6.20200521gitb85051e755b0.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-20200520git115a54162a6c.tar.xz +Source0: linux-20200521gitb85051e755b0.tar.xz Source1: Makefile.rhelver @@ -1277,8 +1277,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-20200520git115a54162a6c -c -mv linux-20200520git115a54162a6c linux-%{KVERREL} +%setup -q -n kernel-20200521gitb85051e755b0 -c +mv linux-20200521gitb85051e755b0 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -2778,8 +2778,8 @@ fi # # %changelog -* Wed May 20 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc6.20200520git115a54162a6c.1] -- 115a54162a6c rebase +* Thu May 21 2020 CKI@GitLab <cki-project@redhat.com> [5.7.0-0.rc6.20200521gitb85051e755b0.1] +- b85051e755b0 rebase - kernel.spec: fix 'make scripts' for kernel-devel package (Brian Masney) - Makefile: correct help text for dist-cross-<arch>-rpms (Brian Masney) - Add Documentation back to kernel-devel as it has Kconfig now ("Justin M. Forbes") @@ -1,3 +1,3 @@ -SHA512 (linux-20200520git115a54162a6c.tar.xz) = c7b931d0309933ce16e727f667bdfad198ecf9fd5f0dc6184228d670712fddda26a4c0c787eb70ef3f7fd578ec7f24d520deb3c1c991e518fcbe1a5603bc534f -SHA512 (kernel-abi-whitelists-5.7.0-0.rc6.20200520git115a54162a6c.1.tar.bz2) = 60072362e5138681c4dfcc19c9f5eced0790af8a24ade573842aa252b8b771aceb86041b589309fb3b865cb6795d0a62086eede02785c417d993e679fd7abe54 -SHA512 (kernel-kabi-dw-5.7.0-0.rc6.20200520git115a54162a6c.1.tar.bz2) = 96522c07d75bd921390c4b0261e718bc1a473af47f5b3cbc07fa6b2608b861b62285481ae3ec5bf97cb96667f9bbac7a584bb060eba0a9dbf3e7996994f31f66 +SHA512 (linux-20200521gitb85051e755b0.tar.xz) = 8a8f1fc415587fffc95e027286015f3c8452b236a3d974f74e58a038d42cc8bebe9cd7c0d6110a1bdbadf94e392397891cd3ef4ad8754ce0c914fb6f4ced2ff5 +SHA512 (kernel-abi-whitelists-5.7.0-0.rc6.20200521gitb85051e755b0.1.tar.bz2) = 8021be0763ed4d90c2fbec85d8b2203f01d8c619d69d3369b63623f330c9bf2765fca4134c2f84d986f80eb90755f45bcd88add29145fa4190eacdfde1893d57 +SHA512 (kernel-kabi-dw-5.7.0-0.rc6.20200521gitb85051e755b0.1.tar.bz2) = 35de327c6e0bef83afefee1a7407392695203644a30dc37ce52aab4b68cf125ebc4423ec9bb74860855061c9656e9e5919beb5cea803ab697b55d9badfcfa844 |