aboutsummaryrefslogtreecommitdiffstats
path: root/main/linux-vanilla/fix-sync-check.patch
diff options
context:
space:
mode:
authorWilliam Pitcock <nenolod@dereferenced.org>2018-01-10 20:01:57 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2018-01-10 22:06:15 +0000
commit9b052dbbcfdc3645493c91f1a80012ba3cdb0d16 (patch)
tree3db7a626ba3c4885bfb6dad7e9ce545fa4a24765 /main/linux-vanilla/fix-sync-check.patch
parent6e2043decb605e3648cb6f3f1a224507c21215bc (diff)
downloadaports-9b052dbbcfdc3645493c91f1a80012ba3cdb0d16.tar.bz2
aports-9b052dbbcfdc3645493c91f1a80012ba3cdb0d16.tar.xz
main/linux-vanilla: upgrade to 4.14.13
Diffstat (limited to 'main/linux-vanilla/fix-sync-check.patch')
-rw-r--r--main/linux-vanilla/fix-sync-check.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/main/linux-vanilla/fix-sync-check.patch b/main/linux-vanilla/fix-sync-check.patch
new file mode 100644
index 0000000000..d4075db8eb
--- /dev/null
+++ b/main/linux-vanilla/fix-sync-check.patch
@@ -0,0 +1,32 @@
+From 9d641b18db295b9ded33df0430940c7df7bb795e Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 15 Dec 2017 11:22:35 +1100
+Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
+
+patch(1) loses the x bit. Kernel build breaks.
+
+Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Josh Poimboeuf <jpoimboe@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
+---
+ tools/objtool/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile
+index ae0272f..e6acc28 100644
+--- a/tools/objtool/Makefile
++++ b/tools/objtool/Makefile
+@@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
+ @$(MAKE) $(build)=objtool
+
+ $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
+- @./sync-check.sh
++ @$(CONFIG_SHELL) ./sync-check.sh
+ $(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
+
+
+--
+cgit v1.1
+