]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix up queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Mar 2023 13:26:57 +0000 (14:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Mar 2023 13:26:57 +0000 (14:26 +0100)
queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch

index d2cd84be9d622165753dd5d3330494e2e43aeba8..a2281c6149e7ebd9e628219ce7eafa5759c74cad 100644 (file)
@@ -45,14 +45,12 @@ Signed-off-by: Dmitry Goncharov <dgoncharov@users.sf.net>
 Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- Makefile | 13 ++++++++++---
+ Makefile |   13 ++++++++++---
  1 file changed, 10 insertions(+), 3 deletions(-)
 
-diff --git a/Makefile b/Makefile
-index 6f846b1f2618..fbd9ff4a61e7 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -93,10 +93,17 @@ endif
+@@ -88,10 +88,17 @@ endif
  
  # If the user is running make -s (silent mode), suppress echoing of
  # commands
@@ -60,7 +58,7 @@ index 6f846b1f2618..fbd9ff4a61e7 100644
  
 -ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),)
 -  quiet=silent_
--  KBUILD_VERBOSE = 0
+-  tools_silent=s
 +ifeq ($(filter 3.%,$(MAKE_VERSION)),)
 +silence:=$(findstring s,$(firstword -$(MAKEFLAGS)))
 +else
@@ -69,10 +67,7 @@ index 6f846b1f2618..fbd9ff4a61e7 100644
 +
 +ifeq ($(silence),s)
 +quiet=silent_
-+KBUILD_VERBOSE = 0
++tools_silent=s
  endif
  
  export quiet Q KBUILD_VERBOSE
--- 
-2.39.2
-