summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2017-02-28 09:05:22 -0800
committerLaura Abbott <labbott@fedoraproject.org>2017-02-28 09:27:39 -0800
commit476553105e5f3a281b06829f62eb073735359497 (patch)
tree2c3eb8c821e49e397e1a24844038d1b90bff4e3f
parent01d844268081b32c484fd01557051c6e69423b3e (diff)
downloadkernel-476553105e5f3a281b06829f62eb073735359497.tar.gz
kernel-476553105e5f3a281b06829f62eb073735359497.tar.xz
kernel-476553105e5f3a281b06829f62eb073735359497.zip
Apply patches with build tweaks (build-AFTER_LINK.patch) and compile
fixes all the time [labbott: Rebased to current rawhide tip. Renumbered some patches]
-rw-r--r--kernel.spec31
1 files changed, 17 insertions, 14 deletions
diff --git a/kernel.spec b/kernel.spec
index b4d155a1a..244394c65 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -487,8 +487,18 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz
%endif
%endif
+## Patches needed for building this package
+
# build tweak for build ID magic, even for -vanilla
-Source5005: kbuild-AFTER_LINK.patch
+Patch001: kbuild-AFTER_LINK.patch
+
+## compile fixes
+
+# ongoing complaint, full discussion delayed until ksummit/plumbers
+Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
+
+# Still other instances of this bug floating around
+Patch003: 0001-Work-around-for-gcc7-and-arm64.patch
%if !%{nopatches}
@@ -583,12 +593,6 @@ Patch509: MODSIGN-Don-t-try-secure-boot-if-EFI-runtime-is-disa.patch
#CVE-2016-3134 rhbz 1317383 1317384
Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch
-#ongoing complaint, full discussion delayed until ksummit/plumbers
-Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch
-
-# Still other instances of this bug floating around
-Patch853: 0001-Work-around-for-gcc7-and-arm64.patch
-
# END OF PATCH DEFINITIONS
%endif
@@ -1188,18 +1192,13 @@ do
done
%endif
-# The kbuild-AFTER_LINK patch is needed regardless so we list it as a Source
-# file and apply it separately from the rest.
-git am %{SOURCE5005}
-
-%if !%{nopatches}
+# Note: Even in the "nopatches" path some patches (build tweaks and compile
+# fixes) will always get applied; see patch defition above for details
git am %{patches}
# END OF PATCH APPLICATIONS
-%endif
-
# Any further pre-build tree manipulations happen here.
chmod +x scripts/checkpatch.pl
@@ -2161,6 +2160,10 @@ fi
* Tue Feb 28 2017 Laura Abbott <labbott@fedoraproject.org> - 4.11.0-0.rc0.git6.1
- Linux v4.10-10531-g86292b3
+* Tue Feb 28 2017 Thorsten Leemhuis <fedora@leemhuis.info>
+- apply patches with build tweaks (build-AFTER-LINK.patch) and compile fixes
+ all the time
+
* Tue Feb 28 2017 Justin M. Forbes <jforbes@fedoraproject.org>
- Fix kernel-devel virtual provide