From 41e8ae3627a9d7da6eab7bf10ce758ba22f6f955 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Mon, 26 Jan 2015 16:10:22 -0500 Subject: [PATCH] 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. --- kernel.spec | 8 ++++++++ sources | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) 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 - 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 - 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