From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756926AbbIVGvL (ORCPT ); Tue, 22 Sep 2015 02:51:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48309 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756232AbbIVGvJ (ORCPT ); Tue, 22 Sep 2015 02:51:09 -0400 Date: Tue, 22 Sep 2015 08:51:00 +0200 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Jiri Olsa , Ingo Molnar , linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Alexei Starovoitov , Adrian Hunter , Borislav Petkov , David Ahern , Frederic Weisbecker , Namhyung Kim , Stephane Eranian , Wang Nan , pi3orama@163.com Subject: Re: [PATCH 5/8] tools build: Allow setting the feature detection user Message-ID: <20150922065100.GF29091@krava.redhat.com> References: <1442870601-26004-1-git-send-email-acme@kernel.org> <1442870601-26004-6-git-send-email-acme@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1442870601-26004-6-git-send-email-acme@kernel.org> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 21, 2015 at 06:23:18PM -0300, Arnaldo Carvalho de Melo wrote: > From: Arnaldo Carvalho de Melo > > We will use the tools/build/ autodetection in the eBPF patchkit > and it is currently sharing the output directory with perf, that > also uses the feature detection logic. > > As se keep state in the output directory, so that we can avoid running > all the tests again, we need to have different filenames for the files > used in this state, allow doing that via the FEATURE_USER variable, > to be set alongside the existing FEATURE_{TEST,DISPLAY} variables. > > Acked-by: Jiri Olsa > Cc: Alexei Starovoitov > Cc: Adrian Hunter > Cc: Borislav Petkov > Cc: David Ahern > Cc: Frederic Weisbecker > Cc: Namhyung Kim > Cc: Stephane Eranian > Cc: Wang Nan > Cc: pi3orama@163.com > Link: http://lkml.kernel.org/n/tip-qzkc56xurvxwppvc1p0qdw3t@git.kernel.org > Signed-off-by: Arnaldo Carvalho de Melo > --- > tools/build/Makefile.feature | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature > index 690d5614edd4..5365d0fefadb 100644 > --- a/tools/build/Makefile.feature > +++ b/tools/build/Makefile.feature > @@ -121,8 +121,9 @@ define feature_print_text_code > MSG = $(shell printf '...%30s: %s' $(1) $(2)) > endef > > +FEATURE_DUMP_FILENAME = $(OUTPUT)FEATURE-DUMP$(FEATURE_USER) > FEATURE_DUMP := $(foreach feat,$(FEATURE_DISPLAY),feature-$(feat)($(feature-$(feat)))) > -FEATURE_DUMP_FILE := $(shell touch $(OUTPUT)FEATURE-DUMP; cat $(OUTPUT)FEATURE-DUMP) > +FEATURE_DUMP_FILE := $(shell touch $(FEATURE_DUMP_FILENAME); cat $(FEATURE_DUMP_FILENAME)) > > ifeq ($(dwarf-post-unwind),1) > FEATURE_DUMP += dwarf-post-unwind($(dwarf-post-unwind-text)) > @@ -136,7 +137,7 @@ endif > # - VF is enabled > > ifneq ("$(FEATURE_DUMP)","$(FEATURE_DUMP_FILE)") > - $(shell echo "$(FEATURE_DUMP)" > $(OUTPUT)FEATURE-DUMP) > + $(shell echo "$(FEATURE_DUMP)" > $(FEATURE_DUMP_FILENAME)) > feature_display := 1 > endif one nit ;-) jirka --- diff --git a/tools/build/Makefile.feature b/tools/build/Makefile.feature index 5365d0fefadb..b37101207cbd 100644 --- a/tools/build/Makefile.feature +++ b/tools/build/Makefile.feature @@ -132,7 +132,7 @@ endif # The $(feature_display) controls the default detection message # output. It's set if: # - detected features differes from stored features from -# last build (in FEATURE-DUMP file) +# last build (in FEATURE-DUMP$(FEATURE_USER) file) # - one of the $(FEATURE_DISPLAY) is not detected # - VF is enabled