summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-10-04 17:09:50 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-10-04 17:09:50 +0200
commit5c65c6a61ffec6c47eef9e33751a8e54f775902d (patch)
treeef820385785a57f60d8861304d9570241811f669 /kernel.spec
parent5de4cf03bd7394503f4ae9aa0b932704e59f5662 (diff)
parentf51db637775e8a0cb3e00e10ee841fafd3198261 (diff)
downloadkernel-5c65c6a61ffec6c47eef9e33751a8e54f775902d.tar.gz
kernel-5c65c6a61ffec6c47eef9e33751a8e54f775902d.tar.xz
kernel-5c65c6a61ffec6c47eef9e33751a8e54f775902d.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc1.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec24
1 files changed, 15 insertions, 9 deletions
diff --git a/kernel.spec b/kernel.spec
index 11678608d..08d63e340 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 1
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -132,7 +132,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
# Kernel headers are being split out into a separate package
%if 0%{?fedora}
@@ -516,16 +516,16 @@ Patch122: Input-synaptics-pin-3-touches-when-the-firmware-repo.patch
# 200 - x86 / secureboot
-# Patch201: efi-lockdown.patch
-
# bz 1497559 - Make kernel MODSIGN code not error on missing variables
-Patch207: 0001-Make-get_cert_list-not-complain-about-cert-lists-tha.patch
-Patch208: 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
-Patch209: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch
+Patch200: 0001-Make-get_cert_list-not-complain-about-cert-lists-tha.patch
+Patch201: 0002-Add-efi_status_to_str-and-rework-efi_status_to_err.patch
+Patch202: 0003-Make-get_cert_list-use-efi_status_to_str-to-print-er.patch
+
+Patch203: disable-i8042-check-on-apple-mac.patch
-Patch210: disable-i8042-check-on-apple-mac.patch
+Patch204: efi-secureboot.patch
-Patch212: efi-secureboot.patch
+Patch205: lift-lockdown-sysrq.patch
# 300 - ARM patches
Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch
@@ -1772,6 +1772,12 @@ fi
#
#
%changelog
+* Fri Oct 04 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc1.git1.1
+- Linux v5.4-rc1-14-gcc3a7bfe62b9
+
+* Fri Oct 04 2019 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Wed Oct 02 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc1.git0.1
- Linux v5.4-rc1