summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-11-08 08:07:22 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2017-11-08 08:07:22 +0100
commit1f5754c540738cc33aad56d072ddd40c6bf45df1 (patch)
tree311171ba81642fbcc923ae9e2045653ce3b7887c
parent02f9b62488caa488585514bdf193832579ff599d (diff)
parent42173792671952453a8add43d30ec85e40dd451a (diff)
downloadkernel-1f5754c540738cc33aad56d072ddd40c6bf45df1.tar.gz
kernel-1f5754c540738cc33aad56d072ddd40c6bf45df1.tar.xz
kernel-1f5754c540738cc33aad56d072ddd40c6bf45df1.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.14.0-0.rc8.git1.1.vanilla.knurd.1.fc27kernel-4.14.0-0.rc8.git1.1.vanilla.knurd.1.fc26
-rw-r--r--gitrev2
-rw-r--r--kernel.spec10
-rw-r--r--sources1
3 files changed, 9 insertions, 4 deletions
diff --git a/gitrev b/gitrev
index 0e6a05a20..2202305ba 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-81ca2caefc6db1df942bdf845a2a74a60842d543
+fbc3edf7d7731d7a22c483c679700589bab936a3
diff --git a/kernel.spec b/kernel.spec
index c8d1e77e2..c2a1f6317 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 8
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -133,7 +133,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
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_without_vanilla: 0} %{?!_without_vanilla: 1}
@@ -403,7 +403,7 @@ Requires: kernel-modules-uname-r = %{KVERREL}%{?variant}
#
# List the packages used during the kernel build
#
-BuildRequires: kmod, patch, bash, sh-utils, tar, git
+BuildRequires: kmod, patch, bash, tar, git
BuildRequires: bzip2, xz, findutils, gzip, m4, perl-interpreter, perl-Carp, perl-devel, perl-generators, make, diffutils, gawk
BuildRequires: gcc, binutils, redhat-rpm-config, hmaccalc
BuildRequires: net-tools, hostname, bc, elfutils-devel
@@ -2238,6 +2238,10 @@ fi
#
#
%changelog
+* Tue Nov 07 2017 Justin M. Forbes <jforbes@fedoraproject.org> - 4.14.0-0.rc8.git1.1
+- Linux v4.14-rc8-9-gfbc3edf7d773
+- Reenable debugging options.
+
* Mon Nov 06 2017 Laura Abbott <labbott@redhat.com>
- Patches for ThinkPad X1 Carbon Gen5 Touchpad (rhbz 1509461)
- Fix for KVM regression on some machines (rhbz 1490803)
diff --git a/sources b/sources
index b896e7bac..159f9e8fd 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
SHA512 (linux-4.13.tar.xz) = a557c2f0303ae618910b7106ff63d9978afddf470f03cb72aa748213e099a0ecd5f3119aea6cbd7b61df30ca6ef3ec57044d524b7babbaabddf8b08b8bafa7d2
SHA512 (perf-man-4.13.tar.gz) = 9bcc2cd8e56ec583ed2d8e0b0c88e7a94035a1915e40b3177bb02d6c0f10ddd4df9b097b1f5af59efc624226b613e240ddba8ddc2156f3682f992d5455fc5c03
SHA512 (patch-4.14-rc8.xz) = 073c16c0813087ebdc04fc938d77edd797e630843ed8bb396df261c425e9be385578989df63da07f6861245c8bda84ba0e54019071f8b5e858d0d536baa72e4c
+SHA512 (patch-4.14-rc8-git1.xz) = fd75d876c400ba7cab741ac1bc96b7532da40e97e4224f4898c75b82aa533906f226089c9a26a3790dcaa0c8309c2ece275303543d919fb3281af93e4394752e