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: Windows password security audit tool. GUI, reports in PDF.

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

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

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.

| 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)

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*')
+#
 #
 # Locate/process JSON files in pmu-events/arch/
 # directory and create tables in pmu-events.c.
 #
-$(OUTPUT)pmu-events/pmu-events.c: $(JSON)
+$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)
        $(Q)$(call echo-cmd,gen)$(JEVENTS) $(ARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c

--
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/