linux-kernel - Re: [PATCH 3/3] perf, tools: Fix jevents dependencies

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150528211557.GR7484@tassilo.jf.intel.com>
Date:	Thu, 28 May 2015 14:15:57 -0700
From:	Andi Kleen <ak@...ux.intel.com>
To:	Sukadev Bhattiprolu <sukadev@...ux.vnet.ibm.com>
Cc:	Andi Kleen <andi@...stfloor.org>, jolsa@...hat.com,
	mingo@...nel.org, acme@...nel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 3/3] perf, tools: Fix jevents dependencies

On Thu, May 28, 2015 at 01:57:16PM -0700, Sukadev Bhattiprolu wrote:
> Andi Kleen [andi@...stfloor.org] wrote:
> | From: Andi Kleen <ak@...ux.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/