]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Mar 2018 09:05:35 +0000 (10:05 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Mar 2018 09:05:35 +0000 (10:05 +0100)
added patches:
kbuild-move-_all-target-out-of-kbuild_src-conditional.patch

queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch [new file with mode: 0644]
queue-4.14/series

diff --git a/queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch b/queue-4.14/kbuild-move-_all-target-out-of-kbuild_src-conditional.patch
new file mode 100644 (file)
index 0000000..ecbb073
--- /dev/null
@@ -0,0 +1,51 @@
+From ba634eceb535d95e87ef09caae7814b3687c6036 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+Date: Wed, 4 Oct 2017 12:56:05 +0900
+Subject: kbuild: move "_all" target out of $(KBUILD_SRC) conditional
+
+From: Masahiro Yamada <yamada.masahiro@socionext.com>
+
+commit ba634eceb535d95e87ef09caae7814b3687c6036 upstream.
+
+The first "_all" occurrence around line 120 is only visible when
+KBUILD_SRC is unset.
+
+If O=... is specified, the working directory is relocated, then the
+only second occurrence around line 193 is visible, that is not set
+to PHONY.
+
+Move the first one to an always visible place.  This clarifies "_all"
+is our default target and it is always set to PHONY.
+
+Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Reviewed-by: Douglas Anderson <dianders@chromium.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ Makefile |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -11,6 +11,10 @@ NAME = Petit Gorille
+ # Comments in this file are targeted only to the developer, do not
+ # expect to learn how to build the kernel reading this file.
++# That's our default target when none is given on the command line
++PHONY := _all
++_all:
++
+ # o Do not use make's built-in rules and variables
+ #   (this increases performance and avoids hard-to-debug behaviour);
+ # o Look for make include files relative to root of kernel src
+@@ -117,10 +121,6 @@ ifeq ("$(origin O)", "command line")
+   KBUILD_OUTPUT := $(O)
+ endif
+-# That's our default target when none is given on the command line
+-PHONY := _all
+-_all:
+-
+ # Cancel implicit rules on top Makefile
+ $(CURDIR)/Makefile Makefile: ;
index 6f446714cc6e2a64899da95545e9b2e70cb1b77c..b1da708ff51e4074010de556b3a93147ad2f3328 100644 (file)
@@ -1,3 +1,4 @@
+kbuild-move-_all-target-out-of-kbuild_src-conditional.patch
 rdma-ucma-limit-possible-option-size.patch
 rdma-ucma-check-that-user-doesn-t-overflow-qp-state.patch
 rdma-mlx5-fix-integer-overflow-while-resizing-cq.patch