summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-01-30 06:17:18 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-01-30 06:17:18 +0100
commitd7388160922c065e293334d4bc15ee799c53b37c (patch)
tree9b65aa8907c45d76daac8de8766d4b1faf218665 /kernel.spec
parente64bd5daffe1f8d493d3ef7286b3b5c72e839584 (diff)
parentf15fea450f793e794b69c9470e1dd0b4c87d62a9 (diff)
downloadkernel-d7388160922c065e293334d4bc15ee799c53b37c.tar.gz
kernel-d7388160922c065e293334d4bc15ee799c53b37c.tar.xz
kernel-d7388160922c065e293334d4bc15ee799c53b37c.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.6.0-0.rc0.git1.1.vanilla.knurd.2.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec14
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel.spec b/kernel.spec
index 3eba9e532..0f8dc5547 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -27,7 +27,7 @@ Summary: The Linux kernel
# For rawhide and/or a kernel built from an rc or git snapshot,
# released_kernel should be 0.
# For a stable, released kernel, released_kernel should be 1.
-%global released_kernel 1
+%global released_kernel 0
%if 0%{?fedora}
%define secure_boot_arch x86_64
@@ -115,7 +115,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 0
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -208,7 +208,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
%if 0%{?fedora}
# Kernel headers are being split out into a separate package
@@ -843,8 +843,6 @@ Patch304: ARM-tegra-usb-no-reset.patch
# Raspberry Pi
# https://patchwork.kernel.org/cover/11271017/
Patch310: Raspberry-Pi-4-PCIe-support.patch
-# https://patchwork.kernel.org/patch/11223139/
-Patch311: ARM-Enable-thermal-support-for-Raspberry-Pi-4.patch
# https://patchwork.kernel.org/patch/11299997/
Patch312: bcm283x-gpu-drm-v3d-Add-ARCH_BCM2835-to-DRM_V3D-Kconfig.patch
@@ -2912,6 +2910,12 @@ fi
#
#
%changelog
+* Wed Jan 29 2020 Jeremy Cline <jcline@redhat.com> - 5.5.0-1
+- Linux v5.5-3996-gb3a608222336
+
+* Wed Jan 29 2020 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Mon Jan 27 2020 Justin M. Forbes <jforbes@fedoraproject.org> - 5.5.0-1
- Linux v5.5