summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-06-16 20:19:32 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-06-16 20:19:32 +0200
commit172d6ff8046b82618aafb5b36961633b27a3d476 (patch)
treec73ead0f3c3a6c971d04373f87eade1015c2ee8d
parentd0b8941357b7ce0c26d19376bc4d827042d6bb12 (diff)
parent3167599aa0bc477a28c595d6ba78bd6bcb8b7cef (diff)
downloadkernel-172d6ff8046b82618aafb5b36961633b27a3d476.tar.gz
kernel-172d6ff8046b82618aafb5b36961633b27a3d476.tar.xz
kernel-172d6ff8046b82618aafb5b36961633b27a3d476.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc1.20200616gita5dc8300df75.1.vanilla.1.fc32
-rw-r--r--kernel.spec18
-rw-r--r--sources6
2 files changed, 13 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec
index c79b8aecc..1fb003cc6 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.rc1.1
+%global distro_build 0.rc1.20200616gita5dc8300df75.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.rc1.1
+%define pkgrelease 0.rc1.20200616gita5dc8300df75.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc1.1%{?buildid}%{?dist}
+%define specrelease 0.rc1.20200616gita5dc8300df75.1%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@@ -168,7 +168,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.8
@@ -569,7 +569,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
-Source0: linux-5.8-rc1.tar.xz
+Source0: linux-20200616gita5dc8300df75.tar.xz
Source1: Makefile.rhelver
@@ -1281,8 +1281,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.8-rc1 -c
-mv linux-5.8-rc1 linux-%{KVERREL}
+%setup -q -n kernel-20200616gita5dc8300df75 -c
+mv linux-20200616gita5dc8300df75 linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2787,8 +2787,10 @@ fi
#
#
%changelog
-* Sun Jun 14 2020 Justin M. Forbes <jforbes@fedoraproject.org> [5.8.0-0.rc1.1]
+* Tue Jun 16 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.20200616gita5dc8300df75.1]
+- a5dc8300df75 rebase
- Fedora config update for rc1 ("Justin M. Forbes")
+- Updated changelog for the release based on v5.8-rc1 (Fedora Kernel Team)
* Sun Jun 14 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc1.1]
- v5.8-rc1 rebase
diff --git a/sources b/sources
index 3cca92c98..e677b5227 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.8-rc1.tar.xz) = f4278f172814017679f2d069e2102c29c212f25af7b8cb9026512b2bba863fd437c110fbc2d5fef7b0be2f8ccad25ed7f14274426f2efbd45403c2d0b4f3aa2a
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc1.1.tar.bz2) = cb52da810d84539be54f9394659d45674774a0ea9c7e72844b8ddaf3bd9217c64b38bd87172cc32e0c9e03f22ca9d7c394bc4c0ad74c4d7a93c28ed6e4b56e5d
-SHA512 (kernel-kabi-dw-5.8.0-0.rc1.1.tar.bz2) = 75f4fe33fccc21e22a92112b81bb4e48fb3013fc699895d52d8670567d2d7a992cabe6b954fb534e4da94092353b7b42136a05bdd5c3d9979503d17e50d1013e
+SHA512 (linux-20200616gita5dc8300df75.tar.xz) = a7639f18de59c5b523ca0260f97cb48bbdb2c9da8d986fe9117f580bd8daf6c8791a3931b3245c57a87a7ac96620fb104c2f026062d02d6f09dba6af9de71deb
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc1.20200616gita5dc8300df75.1.tar.bz2) = dffb3f1ced4e3f051a4c6186b0a2b4c6a83497ce162d7e3783360fbc5d3cbe9e0b35ea984ed1d476774c51d80f6c048a77440c99a0780095174744917c848040
+SHA512 (kernel-kabi-dw-5.8.0-0.rc1.20200616gita5dc8300df75.1.tar.bz2) = 803ed399fc19fcfd1e11e40c0013c5cb9fbc145cb4f6b1d6d2e335ccf4dfa2fda1e345f56193326b5ab3fd8acbc1ee8ee317d9c330ae81d9b377138c1a33d575