lkml.org 
[lkml]   [2015]   [May]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 3/3] perf, tools: Fix jevents dependencies
On Thu, May 28, 2015 at 01:57:16PM -0700, Sukadev Bhattiprolu wrote:
> Andi Kleen [andi@firstfloor.org] wrote:
> | From: Andi Kleen <ak@linux.intel.com>
> |
> | The "find" based dependencies for the JSON files didn't work me. I
> | didn't get a rebuild when the JSON files changed.
>
> Hmm, it works for me every time. I like the 'find' better because it
> is more compact and allows mulitple levels.

You're right. On rechecking it seems to work. Perhaps was some other
problem earlier. So the patch can be dropped.

>
> | Change it to
> | use wildcard. Also add a dependency for the jevents binary itself
> | and for the mapfile.
>
> I was trying this to address Jiri's comment about being silent if
> some architectures don't have JSON files (and based on your comments
> above, added the depedency for mapfile and jevents)

Ok.

>
> diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
> index 7e0c85c..45b05a7 100644
> --- a/tools/perf/pmu-events/Build
> +++ b/tools/perf/pmu-events/Build
> @@ -1,10 +1,12 @@
> jevents-y += json.o jsmn.o jevents.o
> pmu-events-y += pmu-events.o
> -JSON = $(shell find pmu-events/arch/$(ARCH) -name '*.json')
> -
> +EVDIR = pmu-events/arch/$(ARCH)
> +JSON = $(shell [ -d $(EVDIR) ] && \
> + find $(EVDIR) -name '*.json' -o -name 'mapfile*')

BTW should only process a single mapfile called mapfile.csv

Currently it processes editor backup files and similar too, which is not really
intended.

-Andi


\
 
 \ /
  Last update: 2015-05-29 00:01    [W:0.053 / U:0.152 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site