]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 10:02:11 +0000 (11:02 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Jan 2018 10:02:11 +0000 (11:02 +0100)
added patches:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch

queue-4.14/tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch [new file with mode: 0644]

diff --git a/queue-4.14/tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch b/queue-4.14/tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
new file mode 100644 (file)
index 0000000..cd19c8e
--- /dev/null
@@ -0,0 +1,38 @@
+From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001
+From: Andrew Morton <akpm@linux-foundation.org>
+Date: Fri, 12 Jan 2018 16:53:17 -0800
+Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable
+
+From: Andrew Morton <akpm@linux-foundation.org>
+
+commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.
+
+patch(1) loses the x bit.  So if a user follows our patching
+instructions in Documentation/admin-guide/README.rst, their kernel will
+not compile.
+
+Fixes: 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
+Reported-by: Nicolas Bock <nicolasbock@gentoo.org>
+Reported-by Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: Josh Poimboeuf <jpoimboe@redhat.com>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Holger Hoffstätte <holger@applied-asynchrony.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ tools/objtool/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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 $@