summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2016-07-13 10:44:37 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2016-07-13 11:01:59 +0200
commit5237fd95cf6c60e384b8dca6107ab8a1d2724837 (patch)
tree6e556d566a345f1abeac394416fa09117f0190b3
parent298feeb53332ec4fd507c165b3c7c839b64d519b (diff)
downloadkernel-5237fd95cf6c60e384b8dca6107ab8a1d2724837.tar.gz
kernel-5237fd95cf6c60e384b8dca6107ab8a1d2724837.tar.xz
kernel-5237fd95cf6c60e384b8dca6107ab8a1d2724837.zip
Always apply buildfix 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch (82ff1fb714a8ddb67896eb09b1bf6a2c81f088bf)
-rw-r--r--kernel.spec7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel.spec b/kernel.spec
index 21b8d42bf..a70eeba03 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -508,6 +508,9 @@ Source5000: patch-4.%{base_sublevel}-git%{gitrev}.xz
# build tweak for build ID magic, even for -vanilla
Source5005: kbuild-AFTER_LINK.patch
+#Workaround for glibc update
+Patch835: 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
+
%if !%{nopatches}
# Git trees.
@@ -641,9 +644,6 @@ Patch815: 0015-drm-i915-gen9-Calculate-watermarks-during-atomic-che.patch
Patch816: 0016-drm-i915-gen9-Reject-display-updates-that-exceed-wm-.patch
Patch817: 0017-drm-i915-Remove-wm_config-from-dev_priv-intel_atomic.patch
-#Workaround for glibc update
-Patch835: 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
-
#CVE-2016-5389 CVE-2016-5969 rhbz 1354708 1355615
Patch836: tcp-make-challenge-acks-less-predictable.patch
@@ -1246,6 +1246,7 @@ done
# 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}
+ApplyPatch 0001-Work-around-for-addition-of-metag-def-but-not-reloca.patch
%if !%{nopatches}