summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-01-26 16:10:22 -0500
committerJosh Boyer <jwboyer@fedoraproject.org>2015-01-26 16:10:22 -0500
commit41e8ae3627a9d7da6eab7bf10ce758ba22f6f955 (patch)
tree9ec7ed615fa214f8768efa6348715d7424d074c4
parentf4123407df7bff8fac276c47fc5cf32c17445edf (diff)
downloadkernel-41e8ae3627a9d7da6eab7bf10ce758ba22f6f955.tar.gz
kernel-41e8ae3627a9d7da6eab7bf10ce758ba22f6f955.tar.xz
kernel-41e8ae3627a9d7da6eab7bf10ce758ba22f6f955.zip
Fix 3.19-rc6 builds with patch-2.7.3
Upstream patch decided that relative symlinks are dangerous to create via patch, so it refuses to do so. To get the kernel to build, we remove the hunk in patch-3.19-rc6.xz that was attempting to create one, and do it manually in the spec file. The spec change should go away when 3.19 final is out.
-rw-r--r--kernel.spec8
-rw-r--r--sources2
2 files changed, 9 insertions, 1 deletions
diff --git a/kernel.spec b/kernel.spec
index 71e8460c6..b8a367601 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1141,6 +1141,13 @@ cp -al vanilla-%{vanillaversion} linux-%{KVERREL}
cd linux-%{KVERREL}
+#HACK for 3.19-rc6+patch-2.7.3 rbhz 1185928
+# make the symlink for arm64 dt-bindings. sigh.
+mkdir -p arch/arm64/boot/dts/include
+pushd arch/arm64/boot/dts/include/
+ln -s ../../../../../include/dt-bindings
+popd
+
# released_kernel with possible stable updates
%if 0%{?stable_base}
ApplyPatch %{stable_patch_00}
@@ -2205,6 +2212,7 @@ fi
%changelog
* Mon Jan 26 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc6.git0.1
- Linux v3.19-rc6
+- Remove symbolic link hunk from patch-3.19-rc6 (rbhz 1185928)
- Disable debugging options.
* Thu Jan 22 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.19.0-0.rc5.git2.1
diff --git a/sources b/sources
index b256441b9..4adec7995 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
9e854df51ca3fef8bfe566dbd7b89241 linux-3.18.tar.xz
813ccb96f0b379d656e57442c2587ca3 perf-man-3.18.tar.gz
-90beea7083f70000e32c14463e576a46 patch-3.19-rc6.xz
+d8390346b3cbe2460f59e27c6363c0ad patch-3.19-rc6.xz