summaryrefslogtreecommitdiffstats
path: root/kernel.spec
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-20 13:34:33 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-20 13:34:33 -0400
commit5917cde9c1fa840708337929886e92865fcb1371 (patch)
tree86116e473b8a1c0e69d71a3ed0bb10137b455b36 /kernel.spec
parent12f4f4deead321d9cce264bbe3b3cae47ba9df2b (diff)
downloadkernel-5917cde9c1fa840708337929886e92865fcb1371.tar.gz
kernel-5917cde9c1fa840708337929886e92865fcb1371.tar.xz
kernel-5917cde9c1fa840708337929886e92865fcb1371.zip
Linux v3.18-rc1
- Disable debugging options.
Diffstat (limited to 'kernel.spec')
-rw-r--r--kernel.spec20
1 files changed, 12 insertions, 8 deletions
diff --git a/kernel.spec b/kernel.spec
index 586cfa4dc..deff55594 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -42,7 +42,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 4
+%global baserelease 1
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -67,9 +67,9 @@ Summary: The Linux kernel
# The next upstream release sublevel (base_sublevel+1)
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
# The rc snapshot level
-%define rcrev 0
+%define rcrev 1
# The git snapshot level
-%define gitrev 9
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -124,7 +124,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 0
+%define debugbuildsenabled 1
# Want to build a vanilla kernel build without any non-upstream patches?
%define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0}
@@ -609,11 +609,11 @@ Patch26037: HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
Patch26038: USB-quirks-device-qualifier-quirk-for-another-Elan-t.patch
Patch26039: HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
-Patch26040: Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
-
#CVE-2014-8086 rhbz 1151353 1152608
Patch26056: ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
+Patch26057: virtio_console-move-early-VQ-enablement.patch
+
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel
Patch30000: kernel-arm64.patch
@@ -1335,11 +1335,11 @@ ApplyPatch HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-00.patch
ApplyPatch USB-quirks-device-qualifier-quirk-for-another-Elan-t.patch
ApplyPatch HID-usbhid-always-poll-quirk-for-Elan-Touchscreen-01.patch
-ApplyPatch Revert-Btrfs-race-free-update-of-commit-root-for-ro-.patch
-
#CVE-2014-8086 rhbz 1151353 1152608
ApplyPatch ext4-fix-race-between-write-and-fcntl-F_SETFL.patch
+ApplyPatch virtio_console-move-early-VQ-enablement.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does.
@@ -2208,6 +2208,10 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Oct 20 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git0.1
+- Linux v3.18-rc1
+- Disable debugging options.
+
* Fri Oct 17 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.4
- CVE-2014-8086 ext4: race condition (rhbz 1151353 1152608)
- Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)