summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-22 21:46:16 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-22 21:46:16 +0200
commit88cd7f3c81e0773ec035a3bd163b5f213173bc88 (patch)
tree1b7f041991e1b6fe7b940382dc730a40ab342ebb
parent7cb22491eca6b57d56d92ba3ff7e7a4ae4e19304 (diff)
parent5b40d3126128231e6a0d0fe99e5a8e0daff636bc (diff)
downloadkernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.tar.gz
kernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.tar.xz
kernel-88cd7f3c81e0773ec035a3bd163b5f213173bc88.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
-rw-r--r--kernel.spec17
-rw-r--r--sources6
2 files changed, 14 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index ddfe18e7a..9140dee92 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.20200720git5714ee50bb43.1
+%global distro_build 0.rc6.20200721git4fa640dc5230.1
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -71,13 +71,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.8.0
-%define pkgrelease 0.rc6.20200720git5714ee50bb43.1
+%define pkgrelease 0.rc6.20200721git4fa640dc5230.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc6.20200720git5714ee50bb43.1%{?buildid}%{?dist}
+%define specrelease 0.rc6.20200721git4fa640dc5230.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-20200720git5714ee50bb43.tar.xz
+Source0: linux-20200721git4fa640dc5230.tar.xz
Source1: Makefile.rhelver
@@ -1310,8 +1310,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-20200720git5714ee50bb43 -c
-mv linux-20200720git5714ee50bb43 linux-%{KVERREL}
+%setup -q -n kernel-20200721git4fa640dc5230 -c
+mv linux-20200721git4fa640dc5230 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2848,6 +2848,11 @@ fi
#
#
%changelog
+* Tue Jul 21 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200721git4fa640dc5230.1]
+- 4fa640dc5230 rebase
+- Updated changelog for the release based on 5714ee50bb43 (Fedora Kernel Team)
+- redhat/docs: Add Fedora RPM tagging date (Prarit Bhargava)
+
* Mon Jul 20 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc6.20200720git5714ee50bb43.1]
- 5714ee50bb43 rebase
- Updated changelog for the release based on f932d58abc38 (Fedora Kernel Team)
diff --git a/sources b/sources
index 390088699..4318fc977 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-20200720git5714ee50bb43.tar.xz) = c6741413afab4a542312bef80e37c2c69d64414bb9d11e2ca57291fe257b397b7aa0fd1414c8d91227ece61d15db179bd0993e4d7a55b5263bc1e094b760ba22
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc6.20200720git5714ee50bb43.1.tar.bz2) = a7d5ec1cb81a4a2fd9251703b31a3e33407229a7ade1daea6f6f401fdaf55d796c4bccdc9a7456384d0898545f8ce9b509bd7dc0321dd6ee6cbfbcceeb1a067f
-SHA512 (kernel-kabi-dw-5.8.0-0.rc6.20200720git5714ee50bb43.1.tar.bz2) = bfa8b6329b7415ec59614604abbbdb0ce631b579c6c0f3972d223cb4f8877fb34efd541a5dadae11d7bb1bf85b2de9abc903db980308a529eec58a4d8665e5b2
+SHA512 (linux-20200721git4fa640dc5230.tar.xz) = b632241167a5ea57fcbd5bd6bcde9813d62c00fba8a497e0ed1c0aa61f280784429a884683d2e6536ad01c8714360dcb3a280244ca43ddfd01a7f4b9596b4617
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc6.20200721git4fa640dc5230.1.tar.bz2) = f206b41792efa3cc95cd8a6485588834e95670d892396af17dd6535184bf555fa63d7d06852582b5970d638f2799c4c4f2166953962e38ec8922023d5c37d9bb
+SHA512 (kernel-kabi-dw-5.8.0-0.rc6.20200721git4fa640dc5230.1.tar.bz2) = 6218d8560a20d0bb32d2d1c3f0c804af78c4bf116c2ddccb6deb1483c01f2beb495e114b40a7cf94ca939a19c232ede77b20c32ff45db95be8a47fdbe814d883