summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-09-18 07:19:45 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2019-09-18 07:19:45 +0200
commit853a8cb1e9cf73dfe0f5fe610218bd75b8c2aed7 (patch)
tree916fb75655d09bf487550975ea6d5aea573606fd /kernel.spec
parent91ebf52fad78720ca55602e0022d4fca59d5bd2c (diff)
parent021611765e21835528abf95712ab1212d6bcbdf4 (diff)
downloadkernel-853a8cb1e9cf73dfe0f5fe610218bd75b8c2aed7.tar.gz
kernel-853a8cb1e9cf73dfe0f5fe610218bd75b8c2aed7.tar.xz
kernel-853a8cb1e9cf73dfe0f5fe610218bd75b8c2aed7.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc0.git1.1.vanilla.knurd.1.fc31
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec16
1 files changed, 10 insertions, 6 deletions
diff --git a/kernel.spec b/kernel.spec
index dc203363a..19aef642b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -6,7 +6,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1. For rawhide
# and/or a kernel built from an rc or git snapshot, released_kernel should
# be 0.
-%global released_kernel 1
+%global released_kernel 0
# Sign modules on x86. Make sure the config files match this setting if more
# architectures are added.
@@ -77,9 +77,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%global rcrev 1
+%global rcrev 0
# 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}
@@ -554,8 +554,6 @@ Patch321: arm64-tegra-Jetson-TX2-Allow-bootloader-to-configure.patch
# QCom laptop bits
# https://patchwork.kernel.org/patch/11133827/
Patch330: arm64-qcom-i2c-geni-Disable-DMA-processing-on-the-Lenovo-Yoga-C630.patch
-# https://patchwork.kernel.org/patch/11133293/
-Patch332: arm64-dts-qcom-Add-Lenovo-Yoga-C630.patch
# 400 - IBM (ppc/s390x) patches
@@ -1774,6 +1772,12 @@ fi
#
#
%changelog
+* Tue Sep 17 2019 Jeremy Cline <jcline@redhat.com> - 5.4.0-0.rc0.git1.1
+- Linux v5.3-2061-gad062195731b
+
+* Tue Sep 17 2019 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Mon Sep 16 2019 Laura Abbott <labbott@redhat.com> - 5.3.0-1
- Linux v5.3