diff options
author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-24 17:49:34 -0500 |
---|---|---|
committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-02-24 17:49:49 -0500 |
commit | adc659526c359e43c9760014d4354282f353d50b (patch) | |
tree | 70fc6391d25a21089fc24457d86222ae84c0d219 /kernel.spec | |
parent | f7bbaa5ad931357b0e53974dd4ebca385802366e (diff) | |
download | kernel-adc659526c359e43c9760014d4354282f353d50b.tar.gz kernel-adc659526c359e43c9760014d4354282f353d50b.tar.xz kernel-adc659526c359e43c9760014d4354282f353d50b.zip |
Linux v4.0-rc1-22-gb24e2bdde4af
- Reenable debugging options.
Fixup one more 3.x place and make sure we don't apply the -rcX patch in yet
another spot.
Diffstat (limited to 'kernel.spec')
-rw-r--r-- | kernel.spec | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/kernel.spec b/kernel.spec index 43146ce12..55995533d 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 2 +%global baserelease 1 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -70,7 +70,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 1 # The git snapshot level -%define gitrev 0 +%define gitrev 1 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -125,7 +125,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 %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -620,9 +620,6 @@ Patch26137: fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch #CVE-2015-0275 rhbz 1193907 1195178 Patch26138: ext4-Allocate-entire-range-in-zero-range.patch -#rhbz 1188439 -Patch26139: HID-i2c-hid-Limit-reads-to-wMaxInputLength-bytes-for.patch - # git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff master...devel Patch30000: kernel-arm64.patch Patch30001: kernel-arm64-fix-psci-when-pg.patch @@ -995,7 +992,7 @@ ApplyPatch() exit 1 fi if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME%%%%%{?variant}}.spec ; then - if [ "${patch:0:8}" != "patch-3." ] ; then + if [ "${patch:0:8}" != "patch-4." ] ; then echo "ERROR: Patch $patch not listed as a source patch in specfile" exit 1 fi @@ -1125,7 +1122,7 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then # Update vanilla to the latest upstream. # (non-released_kernel case only) %if 0%{?rcrev} - ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}.xz +# ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}.xz %if 0%{?gitrev} ApplyPatch patch-4.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.xz %endif @@ -1352,9 +1349,6 @@ ApplyPatch fifo-nv04-remove-the-loop-from-the-interrupt-handler.patch #CVE-2015-0275 rhbz 1193907 1195178 ApplyPatch ext4-Allocate-entire-range-in-zero-range.patch -#rhbz 1188439 -ApplyPatch HID-i2c-hid-Limit-reads-to-wMaxInputLength-bytes-for.patch - %if 0%{?aarch64patches} ApplyPatch kernel-arm64.patch %ifnarch aarch64 # this is stupid, but i want to notice before secondary koji does. @@ -2215,6 +2209,10 @@ fi # # %changelog +* Tue Feb 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.0.0-0.rc1.git1.1 +- Linux v4.0-rc1-22-gb24e2bdde4af +- Reenable debugging options. + * Tue Feb 24 2015 Richard W.M. Jones <rjones@redhat.com> - 4.0.0-0.rc1.git0.2 - Add patch to fix aarch64 KVM bug with module loading (rhbz 1194366). |