Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3701ef6 authored by John Garry's avatar John Garry Committed by Greg Kroah-Hartman
Browse files

perf jevents: Make build dependency on test JSONs 



[ Upstream commit 517db3b59537a59f6cc251b1926df93e93bb9c87 ]

Currently all JSONs and the mapfile for an arch are dependencies for
building pmu-events.c

The test JSONs are missing as a dependency, so add them.

Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Reported-by: default avatarArnaldo Carvalho de Melo <acme@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: linuxarm@huawei.com
Link: http://lore.kernel.org/lkml/90094733-741c-50e5-ac7d-f5640b5f0bdd@huawei.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Stable-dep-of: 7822a8913f4c ("perf build: Update build rule for generated files")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a12e9ba7

tools/perf/pmu-events/Build

+4 −1
Original line number Diff line number Diff line
@@ -6,10 +6,13 @@ pmu-events-y += pmu-events.o 
JDIR		=  pmu-events/arch/$(SRCARCH)

JSON		=  $(shell [ -d $(JDIR) ] &&				\

			find $(JDIR) -name '*.json' -o -name 'mapfile.csv')

JDIR_TEST	=  pmu-events/arch/test

JSON_TEST	=  $(shell [ -d $(JDIR_TEST) ] &&			\

			find $(JDIR_TEST) -name '*.json')



#

# Locate/process JSON files in pmu-events/arch/

# directory and create tables in pmu-events.c.

#

$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JEVENTS)

$(OUTPUT)pmu-events/pmu-events.c: $(JSON) $(JSON_TEST) $(JEVENTS)

	$(Q)$(call echo-cmd,gen)$(JEVENTS) $(SRCARCH) pmu-events/arch $(OUTPUT)pmu-events/pmu-events.c $(V)