summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2019-01-29 09:24:52 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2019-01-29 09:24:52 +0100
commit2865854d2d6f16e91c8f9c713a347c17e8670637 (patch)
tree4a9329f203d3479dd557a5e882fed40ea828783e
parent52af051a452b8dd045d82ae2fc78bdfb2b090b2a (diff)
parentfee69e6d042e5d8e582d68c1c85adf97d36db260 (diff)
downloadkernel-2865854d2d6f16e91c8f9c713a347c17e8670637.tar.gz
kernel-2865854d2d6f16e91c8f9c713a347c17e8670637.tar.xz
kernel-2865854d2d6f16e91c8f9c713a347c17e8670637.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.0.0-0.rc4.git1.1.vanilla.knurd.1.fc29
-rw-r--r--gitrev2
-rw-r--r--kernel.spec10
-rw-r--r--sources1
3 files changed, 10 insertions, 3 deletions
diff --git a/gitrev b/gitrev
index 56604ba0c..4a4ea999c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-333478a7eb21245880c89aad166ad08478cc577d
+4aa9fc2a435abe95a1e8d7f8c7b3d6356514b37a
diff --git a/kernel.spec b/kernel.spec
index f4628ea68..bf8f6e5ee 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -79,7 +79,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 4
# 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}
@@ -1896,6 +1896,12 @@ fi
#
#
%changelog
+* Tue Jan 29 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc4.git1.1
+- Linux v5.0-rc4-1-g4aa9fc2a435a
+
+* Tue Jan 29 2019 Laura Abbott <labbott@redhat.com>
+- Reenable debugging options.
+
* Mon Jan 28 2019 Laura Abbott <labbott@redhat.com> - 5.0.0-0.rc4.git0.1
- Linux v5.0-rc4
- Disable debugging options.
diff --git a/sources b/sources
index 94529db28..63c96943a 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (linux-5.0-rc4.tar.gz) = bc7431fd672e4a96c466ec108a17a692b617f60914924ba7fa635d901f632a0b25d067d427eaff4195e3e7c6c5d6269aff3c896854cd5a42a31f6b830c693f0f
+SHA512 (patch-5.0-rc4-git1.xz) = 90c0bbc8c2ac23397e98ec44ef919da5284cdf4c99be67b020136717052c8cbc3054cfacfed4a6e13f054dd915e5a4a4740ce7cd053d3afce96b8813978c8cbe