Skip to content

Commit 749dd4c

Browse files
committed
Revert "perf jevents: Handle deleted JSONS in out of source builds"
This reverts commit b56111d which is commit 297c9d9 upstream. It causes build issues for arm64. Link: https://lore.kernel.org/r/200019ee-d40a-414f-9dfb-c3fcbdbed969@gmail.com Reported-by: Florian Fainelli <f.fainelli@gmail.com> Cc: Mark Brown <broonie@kernel.org> Cc: James Clark <james.clark@linaro.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ian Rogers <irogers@google.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 537b583 commit 749dd4c

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

  • tools/perf/pmu-events

tools/perf/pmu-events/Build

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
pmu-events-y += pmu-events.o
22
JSON = $(shell find pmu-events/arch -name '*.json' -o -name '*.csv')
3-
JSON_DIRS = $(shell find pmu-events/arch -type d)
43
JDIR_TEST = pmu-events/arch/test
54
JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \
65
find $(JDIR_TEST) -name '*.json')
@@ -32,23 +31,16 @@ $(PMU_EVENTS_C): $(EMPTY_PMU_EVENTS_C)
3231
else
3332
# Copy checked-in json to OUTPUT for generation if it's an out of source build
3433
ifneq ($(OUTPUT),)
35-
# Remove all output directories when any source directory timestamp changes
36-
# so there are no stale deleted files
37-
JSON_DIRS_ROOT = $(OUTPUT)pmu-events/arch/
38-
$(JSON_DIRS_ROOT): $(JSON_DIRS)
39-
$(Q)$(call echo-cmd,gen)rm -rf $@
40-
$(Q)mkdir -p $@
41-
42-
$(OUTPUT)pmu-events/arch/%: pmu-events/arch/% $(JSON_DIRS_ROOT)
34+
$(OUTPUT)pmu-events/arch/%: pmu-events/arch/%
4335
$(call rule_mkdir)
4436
$(Q)$(call echo-cmd,gen)cp $< $@
4537
endif
4638

47-
$(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY) $(JSON_DIRS_ROOT)
39+
$(LEGACY_CACHE_JSON): $(LEGACY_CACHE_PY)
4840
$(call rule_mkdir)
4941
$(Q)$(call echo-cmd,gen)$(PYTHON) $(LEGACY_CACHE_PY) > $@
5042

51-
GEN_JSON = $(patsubst %,$(OUTPUT)%,$(JSON)) $(LEGACY_CACHE_JSON) $(JSON_DIRS)
43+
GEN_JSON = $(patsubst %,$(OUTPUT)%,$(JSON)) $(LEGACY_CACHE_JSON)
5244

5345
$(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY)
5446
$(call rule_mkdir)

0 commit comments

Comments
 (0)