summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-07-08 19:32:07 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-07-08 19:32:07 +0200
commiteba7d0a2b73bc65ea1cc1efd6d63675272a189be (patch)
tree9951a0559040bdca1e9892b2af2859c007958f4f
parentf74174ce806f67006fc43d0822e891966702d82c (diff)
parenta6d0f2858ff60881f95ba4f610089b8b7778d671 (diff)
downloadkernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.tar.gz
kernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.tar.xz
kernel-eba7d0a2b73bc65ea1cc1efd6d63675272a189be.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.vanilla.1.fc32
-rw-r--r--0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch2
-rw-r--r--kernel.spec18
-rw-r--r--sources6
3 files changed, 15 insertions, 11 deletions
diff --git a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
index 0b2bae28d..63cd86b35 100644
--- a/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
+++ b/0001-s390-Lock-down-the-kernel-when-the-IPL-secure-flag-i.patch
@@ -41,7 +41,7 @@ index 90a2a17239b0..be3b72c53656 100644
+ return !!ipl_secure_flag;
+}
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c
-index 5853c9872dfe..fab9bc9889da 100644
+index 07aa15ba43b3..307abb2d82d7 100644
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@ -49,6 +49,7 @@
diff --git a/kernel.spec b/kernel.spec
index 5b66ee9cd..aebdf5b4f 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.1
+%global distro_build 0.rc4.20200708gitdcde237b9b0e.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.rc4.1
+%define pkgrelease 0.rc4.20200708gitdcde237b9b0e.1
# This is needed to do merge window version magic
%define patchlevel 8
# allow pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.1%{?buildid}%{?dist}
+%define specrelease 0.rc4.20200708gitdcde237b9b0e.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-rc4.tar.xz
+Source0: linux-20200708gitdcde237b9b0e.tar.xz
Source1: Makefile.rhelver
@@ -1282,8 +1282,8 @@ ApplyOptionalPatch()
fi
}
-%setup -q -n kernel-5.8-rc4 -c
-mv linux-5.8-rc4 linux-%{KVERREL}
+%setup -q -n kernel-20200708gitdcde237b9b0e -c
+mv linux-20200708gitdcde237b9b0e linux-%{KVERREL}
cd linux-%{KVERREL}
# cp -a %{SOURCE1} .
@@ -2794,6 +2794,10 @@ fi
#
#
%changelog
+* Wed Jul 08 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.20200708gitdcde237b9b0e.1]
+- dcde237b9b0e rebase
+- Updated changelog for the release based on v5.8-rc4 (Fedora Kernel Team)
+
* Mon Jul 06 2020 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.8.0-0.rc4.1]
- v5.8-rc4 rebase
- Updated changelog for the release based on cd77006e01b3 (Fedora Kernel Team)
diff --git a/sources b/sources
index 15a7f306a..1fa1b1bd9 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (linux-5.8-rc4.tar.xz) = 4d691460552753ec9e8a1f7e28939268dc5846ddb0bf741be6effd8bced8b7ba572a45d9d55b94234433cb5297bd328a0895d3ce2c954d4d4cdb3821e02c2354
-SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.1.tar.bz2) = 6cf6916e50824dd5f1260cf7931446a02a5c1f5decd7e9ce67f35aac05d19ffb71190d837c109dc44b05ba66780515d9ef41f7a4c317c9da929ac22c08952528
-SHA512 (kernel-kabi-dw-5.8.0-0.rc4.1.tar.bz2) = c9588c59b60f7e774b8900d3e7ce308b6c4aaf97b69d7e5f0db6ef05f4833851b066436e0f099a975cfae6bf5a5d1c634e9049899736f7444274d61cfa200f47
+SHA512 (linux-20200708gitdcde237b9b0e.tar.xz) = f04d7659447705de100618b0e0a398d4296145d80f00dd5898bba5a29fd208d907c6460c0577ab732f753c450c4ce9006d57d2843f2462823cde26e7d9056952
+SHA512 (kernel-abi-whitelists-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.tar.bz2) = 6b8233818994e6bdf9ab1f75fb4fcfc3b1f6483927420888980cd2f3e0ab3097ab69d6853797b60a5f4dbe494e2442500256543e979ab0c738bf585a5ba653a6
+SHA512 (kernel-kabi-dw-5.8.0-0.rc4.20200708gitdcde237b9b0e.1.tar.bz2) = c638f9abe1bf7fb47a7bc7d2824612f48cdb008d25cd57fd02346b864b8c7f85b91640012be40f524fd6672ea1f525a84273e553c7251a2c3870ebec4175b004