From 59f70e2cd119d122a332c5908408a21ae1bb881b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 8 Mar 2023 14:26:57 +0100 Subject: [PATCH] fix up queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch --- ...t-silent-mode-detection-to-future-gnu-make.patch | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch b/queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch index d2cd84be9d6..a2281c6149e 100644 --- a/queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch +++ b/queue-4.14/kbuild-port-silent-mode-detection-to-future-gnu-make.patch @@ -45,14 +45,12 @@ Signed-off-by: Dmitry Goncharov Signed-off-by: Masahiro Yamada Signed-off-by: Greg Kroah-Hartman --- - 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 - -- 2.47.3