lkml.org 
[lkml]   [2018]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 072/193] tools build: Add tools tree support for make -s
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Josh Poimboeuf <jpoimboe@redhat.com>

    commit e572d0887137acfc53f18175522964ec19d88175 upstream.

    When doing a kernel build with 'make -s', everything is silenced except
    the objtool build. That's because the tools tree support for silent
    builds is some combination of missing and broken.

    Three changes are needed to fix it:

    - Makefile: propagate '-s' to the sub-make's MAKEFLAGS variable so the
    tools Makefiles can see it.

    - tools/scripts/Makefile.include: fix the tools Makefiles' ability to
    recognize '-s'. The MAKE_VERSION and MAKEFLAGS checks are copied from
    the top-level Makefile. This silences the "DESCEND objtool" message.

    - tools/build/Makefile.build: add support to the tools Build files for
    recognizing '-s'. Again the MAKE_VERSION and MAKEFLAGS checks are
    copied from the top-level Makefile. This silences all the object
    compile/link messages.

    Reported-and-Tested-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Michal Marek <mmarek@suse.com>
    Link: http://lkml.kernel.org/r/e8967562ef640c3ae9a76da4ae0f4e47df737c34.1484799200.git.jpoimboe@redhat.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    Makefile | 6 ++++--
    tools/build/Makefile.build | 10 ++++++++++
    tools/scripts/Makefile.include | 12 +++++++++++-
    3 files changed, 25 insertions(+), 3 deletions(-)

    --- a/Makefile
    +++ b/Makefile
    @@ -87,10 +87,12 @@ endif
    ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
    ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
    quiet=silent_
    + tools_silent=s
    endif
    else # make-3.8x
    ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
    quiet=silent_
    + tools_silent=-s
    endif
    endif

    @@ -1523,11 +1525,11 @@ image_name:
    # Clear a bunch of variables before executing the submake
    tools/: FORCE
    $(Q)mkdir -p $(objtree)/tools
    - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/
    + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/

    tools/%: FORCE
    $(Q)mkdir -p $(objtree)/tools
    - $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*
    + $(Q)$(MAKE) LDFLAGS= MAKEFLAGS="$(tools_silent) $(filter --j% -j,$(MAKEFLAGS))" O=$(shell cd $(objtree) && /bin/pwd) subdir=tools -C $(src)/tools/ $*

    # Single targets
    # ---------------------------------------------------------------------------
    --- a/tools/build/Makefile.build
    +++ b/tools/build/Makefile.build
    @@ -19,6 +19,16 @@ else
    Q=@
    endif

    +ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
    +ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
    + quiet=silent_
    +endif
    +else # make-3.8x
    +ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
    + quiet=silent_
    +endif
    +endif
    +
    build-dir := $(srctree)/tools/build

    # Define $(fixdep) for dep-cmd function
    --- a/tools/scripts/Makefile.include
    +++ b/tools/scripts/Makefile.include
    @@ -46,6 +46,16 @@ else
    NO_SUBDIR = :
    endif

    +ifneq ($(filter 4.%,$(MAKE_VERSION)),) # make-4
    +ifneq ($(filter %s ,$(firstword x$(MAKEFLAGS))),)
    + silent=1
    +endif
    +else # make-3.8x
    +ifneq ($(filter s% -s%,$(MAKEFLAGS)),)
    + silent=1
    +endif
    +endif
    +
    #
    # Define a callable command for descending to a new directory
    #
    @@ -58,7 +68,7 @@ descend = \
    QUIET_SUBDIR0 = +$(MAKE) $(COMMAND_O) -C # space to separate -C and subdir
    QUIET_SUBDIR1 =

    -ifneq ($(findstring $(MAKEFLAGS),s),s)
    +ifneq ($(silent),1)
    ifneq ($(V),1)
    QUIET_CC = @echo ' CC '$@;
    QUIET_CC_FPIC = @echo ' CC FPIC '$@;

    \
     
     \ /
      Last update: 2018-02-23 21:24    [W:4.098 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site