Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1286198 > unrolled thread

[PATCH v2 01/14] perf: Fix 'make clean'

Started byJosh Poimboeuf <jpoimboe@redhat.com>
First post2015-12-08 05:30 +0100
Last post2015-12-08 19:50 +0100
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCH v2 01/14] perf: Fix 'make clean' Josh Poimboeuf <jpoimboe@redhat.com> - 2015-12-08 05:30 +0100
    Re: [PATCH v2 01/14] perf: Fix 'make clean' Jiri Olsa <jolsa@redhat.com> - 2015-12-08 18:50 +0100
      Re: [PATCH v2 01/14] perf: Fix 'make clean' Josh Poimboeuf <jpoimboe@redhat.com> - 2015-12-08 19:50 +0100
      Re: [PATCH v2 01/14] perf: Fix 'make clean' Josh Poimboeuf <jpoimboe@redhat.com> - 2015-12-08 19:50 +0100
      Re: [PATCH v2 01/14] perf: Fix 'make clean' Jiri Olsa <jolsa@redhat.com> - 2015-12-08 19:50 +0100

#1286198 — [PATCH v2 01/14] perf: Fix 'make clean'

FromJosh Poimboeuf <jpoimboe@redhat.com>
Date2015-12-08 05:30 +0100
Subject[PATCH v2 01/14] perf: Fix 'make clean'
Message-ID<qDi4x-5SE-11@gated-at.bofh.it>
Add some missing files to the 'make clean' target.

Reported-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
---
 tools/perf/Makefile.perf | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 929a32b..8b63dbd 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -584,13 +584,22 @@ config-clean:
 	$(call QUIET_CLEAN, config)
 	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
 
-clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
+feature-clean:
+	$(call QUIET_CLEAN, feature)
+	$(Q)$(RM) -r $(OUTPUT)feature
+
+tests-clean:
+	$(call QUIET_CLEAN, tests)
+	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete
+	$(Q)$(RM) $(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
+
+clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean feature-clean tests-clean
 	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
 	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
 	$(Q)$(RM) $(OUTPUT).config-detected
 	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
 	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
-		$(OUTPUT)util/intel-pt-decoder/inat-tables.c
+		$(OUTPUT)util/intel-pt-decoder/inat-tables.c $(OUTPUT)fixdep
 	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
 	$(python-clean)
 
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1286721

FromJiri Olsa <jolsa@redhat.com>
Date2015-12-08 18:50 +0100
Message-ID<qDuyJ-5mF-5@gated-at.bofh.it>
In reply to#1286198
On Mon, Dec 07, 2015 at 10:21:39PM -0600, Josh Poimboeuf wrote:
> Add some missing files to the 'make clean' target.
> 
> Reported-by: Jiri Olsa <jolsa@redhat.com>
> Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> ---
>  tools/perf/Makefile.perf | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 929a32b..8b63dbd 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -584,13 +584,22 @@ config-clean:
>  	$(call QUIET_CLEAN, config)
>  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
>  
> -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> +feature-clean:
> +	$(call QUIET_CLEAN, feature)
> +	$(Q)$(RM) -r $(OUTPUT)feature

that should be within feature dir

> +
> +tests-clean:
> +	$(call QUIET_CLEAN, tests)
> +	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete

hum, that'd be excuted twice (another one below)

how about putting llvm-src* files under core-gen clean below

jirka

> +	$(Q)$(RM) $(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
> +
> +clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean feature-clean tests-clean
>  	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
>  	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
>  	$(Q)$(RM) $(OUTPUT).config-detected
>  	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
>  	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
> -		$(OUTPUT)util/intel-pt-decoder/inat-tables.c
> +		$(OUTPUT)util/intel-pt-decoder/inat-tables.c $(OUTPUT)fixdep
>  	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
>  	$(python-clean)

---
diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
index cea04ce9f35c..b87427c4ca1e 100644
--- a/tools/build/feature/Makefile
+++ b/tools/build/feature/Makefile
@@ -179,3 +179,6 @@ test-bpf.bin:
 
 clean:
 	rm -f $(FILES) *.d $(FILES:.bin=.make.output)
+ifdef OUTPUT
+	rm -rf $(OUTPUT)feature
+endif
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
index 929a32ba15f5..c80b74cc437d 100644
--- a/tools/perf/Makefile.perf
+++ b/tools/perf/Makefile.perf
@@ -590,7 +590,8 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
 	$(Q)$(RM) $(OUTPUT).config-detected
 	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
 	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
-		$(OUTPUT)util/intel-pt-decoder/inat-tables.c
+		$(OUTPUT)util/intel-pt-decoder/inat-tables.c \
+		$(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
 	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
 	$(python-clean)
 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1286764

FromJosh Poimboeuf <jpoimboe@redhat.com>
Date2015-12-08 19:50 +0100
Message-ID<qDvuN-5Xs-1@gated-at.bofh.it>
In reply to#1286721
On Tue, Dec 08, 2015 at 06:40:12PM +0100, Jiri Olsa wrote:
> On Mon, Dec 07, 2015 at 10:21:39PM -0600, Josh Poimboeuf wrote:
> > Add some missing files to the 'make clean' target.
> > 
> > Reported-by: Jiri Olsa <jolsa@redhat.com>
> > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> > ---
> >  tools/perf/Makefile.perf | 13 +++++++++++--
> >  1 file changed, 11 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 929a32b..8b63dbd 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -584,13 +584,22 @@ config-clean:
> >  	$(call QUIET_CLEAN, config)
> >  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> >  
> > -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> > +feature-clean:
> > +	$(call QUIET_CLEAN, feature)
> > +	$(Q)$(RM) -r $(OUTPUT)feature
> 
> that should be within feature dir

Ok, I'll try to figure out how to use the feature Makefile to do it.

> > +
> > +tests-clean:
> > +	$(call QUIET_CLEAN, tests)
> > +	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete
> 
> hum, that'd be excuted twice (another one below)

True, though the "find" statement below doesn't touch $(OUTPUT).  I'll
get rid of this one and make the below one more universal.

> how about putting llvm-src* files under core-gen clean below

Ok.

> jirka
> 
> > +	$(Q)$(RM) $(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
> > +
> > +clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean feature-clean tests-clean
> >  	$(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
> >  	$(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
> >  	$(Q)$(RM) $(OUTPUT).config-detected
> >  	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
> >  	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
> > -		$(OUTPUT)util/intel-pt-decoder/inat-tables.c
> > +		$(OUTPUT)util/intel-pt-decoder/inat-tables.c $(OUTPUT)fixdep
> >  	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
> >  	$(python-clean)
> 
> ---
> diff --git a/tools/build/feature/Makefile b/tools/build/feature/Makefile
> index cea04ce9f35c..b87427c4ca1e 100644
> --- a/tools/build/feature/Makefile
> +++ b/tools/build/feature/Makefile
> @@ -179,3 +179,6 @@ test-bpf.bin:
>  
>  clean:
>  	rm -f $(FILES) *.d $(FILES:.bin=.make.output)
> +ifdef OUTPUT
> +	rm -rf $(OUTPUT)feature
> +endif
> diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> index 929a32ba15f5..c80b74cc437d 100644
> --- a/tools/perf/Makefile.perf
> +++ b/tools/perf/Makefile.perf
> @@ -590,7 +590,8 @@ clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
>  	$(Q)$(RM) $(OUTPUT).config-detected
>  	$(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
>  	$(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* \
> -		$(OUTPUT)util/intel-pt-decoder/inat-tables.c
> +		$(OUTPUT)util/intel-pt-decoder/inat-tables.c \
> +		$(OUTPUT)tests/llvm-src-{base,kbuild,prologue}.c
>  	$(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
>  	$(python-clean)
>  

-- 
Josh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1286766

FromJosh Poimboeuf <jpoimboe@redhat.com>
Date2015-12-08 19:50 +0100
Message-ID<qDvuO-5Xs-9@gated-at.bofh.it>
In reply to#1286721
On Tue, Dec 08, 2015 at 07:40:43PM +0100, Jiri Olsa wrote:
> On Tue, Dec 08, 2015 at 06:40:12PM +0100, Jiri Olsa wrote:
> > On Mon, Dec 07, 2015 at 10:21:39PM -0600, Josh Poimboeuf wrote:
> > > Add some missing files to the 'make clean' target.
> > > 
> > > Reported-by: Jiri Olsa <jolsa@redhat.com>
> > > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> > > ---
> > >  tools/perf/Makefile.perf | 13 +++++++++++--
> > >  1 file changed, 11 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > > index 929a32b..8b63dbd 100644
> > > --- a/tools/perf/Makefile.perf
> > > +++ b/tools/perf/Makefile.perf
> > > @@ -584,13 +584,22 @@ config-clean:
> > >  	$(call QUIET_CLEAN, config)
> > >  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> > >  
> > > -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> > > +feature-clean:
> > > +	$(call QUIET_CLEAN, feature)
> > > +	$(Q)$(RM) -r $(OUTPUT)feature
> > 
> > that should be within feature dir
> > 
> > > +
> > > +tests-clean:
> > > +	$(call QUIET_CLEAN, tests)
> > > +	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete
> > 
> > hum, that'd be excuted twice (another one below)
> 
> it also crashes build test (make -f tests/make)

Thanks, I'll look into it.

> 
> jirka
> 
> [jolsa@krava perf]$ make -f tests/make make_clean_all_O
> Testing Makefile
> - make_clean_all_O: cd . && make -f Makefile O=/tmp/tmp.glBnmXFNzM DESTDIR=/tmp/tmp.S5f5hGWoVy clean all
> cd . && make -f Makefile O=/tmp/tmp.glBnmXFNzM DESTDIR=/tmp/tmp.S5f5hGWoVy clean all
>   CLEAN    libapi
>   CLEAN    libtraceevent
>   CLEAN    libbpf
>   CLEAN    config
>   CLEAN    feature
>   CLEAN    tests
> find: ‘/tmp/tmp.glBnmXFNzM/tests’: No such file or directory
> Makefile.perf:592: recipe for target 'tests-clean' failed
> make[3]: *** [tests-clean] Error 1
> make[3]: *** Waiting for unfinished jobs....
> Makefile:75: recipe for target 'clean' failed
> make[2]: *** [clean] Error 2
> tests/make:249: recipe for target 'make_clean_all_O' failed
> make[1]: *** [make_clean_all_O] Error 1
> tests/make:10: recipe for target 'make_clean_all_O' failed
> make: *** [make_clean_all_O] Error 2

-- 
Josh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1286771

FromJiri Olsa <jolsa@redhat.com>
Date2015-12-08 19:50 +0100
Message-ID<qDvuO-5Xs-11@gated-at.bofh.it>
In reply to#1286721
On Tue, Dec 08, 2015 at 06:40:12PM +0100, Jiri Olsa wrote:
> On Mon, Dec 07, 2015 at 10:21:39PM -0600, Josh Poimboeuf wrote:
> > Add some missing files to the 'make clean' target.
> > 
> > Reported-by: Jiri Olsa <jolsa@redhat.com>
> > Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
> > ---
> >  tools/perf/Makefile.perf | 13 +++++++++++--
> >  1 file changed, 11 insertions(+), 2 deletions(-)
> > 
> > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf
> > index 929a32b..8b63dbd 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -584,13 +584,22 @@ config-clean:
> >  	$(call QUIET_CLEAN, config)
> >  	$(Q)$(MAKE) -C $(srctree)/tools/build/feature/ clean >/dev/null
> >  
> > -clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean $(LIBBPF)-clean config-clean
> > +feature-clean:
> > +	$(call QUIET_CLEAN, feature)
> > +	$(Q)$(RM) -r $(OUTPUT)feature
> 
> that should be within feature dir
> 
> > +
> > +tests-clean:
> > +	$(call QUIET_CLEAN, tests)
> > +	$(Q)find $(OUTPUT)tests -name '*.o' -delete -o -name '\.*.cmd' -delete
> 
> hum, that'd be excuted twice (another one below)

it also crashes build test (make -f tests/make)

jirka

[jolsa@krava perf]$ make -f tests/make make_clean_all_O
Testing Makefile
- make_clean_all_O: cd . && make -f Makefile O=/tmp/tmp.glBnmXFNzM DESTDIR=/tmp/tmp.S5f5hGWoVy clean all
cd . && make -f Makefile O=/tmp/tmp.glBnmXFNzM DESTDIR=/tmp/tmp.S5f5hGWoVy clean all
  CLEAN    libapi
  CLEAN    libtraceevent
  CLEAN    libbpf
  CLEAN    config
  CLEAN    feature
  CLEAN    tests
find: ‘/tmp/tmp.glBnmXFNzM/tests’: No such file or directory
Makefile.perf:592: recipe for target 'tests-clean' failed
make[3]: *** [tests-clean] Error 1
make[3]: *** Waiting for unfinished jobs....
Makefile:75: recipe for target 'clean' failed
make[2]: *** [clean] Error 2
tests/make:249: recipe for target 'make_clean_all_O' failed
make[1]: *** [make_clean_all_O] Error 1
tests/make:10: recipe for target 'make_clean_all_O' failed
make: *** [make_clean_all_O] Error 2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web