perf tools: Fix dependency for version file creation
The version generated by perf may not be correct by just changing the head commit, like this: $ git log --pretty=format:"%H" -n 1 b5d9d4708a24ac1889a30e9aedf8af8d73102139 $ perf -v perf version 5.16.gb5d9d4708a24 $ git reset --hard HEAD^ HEAD is now at 629f520b265f $ make ... $ ./perf -v perf version 5.16.gb5d9d4708a24 The dependency to building PERF-VERSION-FILE should also include ORIG_HEAD, as this changes when changing the head commit (while HEAD does not). Signed-off-by: John Garry <john.garry@huawei.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@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: Robert Richter <rric@kernel.org> Link: https://lore.kernel.org/r/1645449409-158238-2-git-send-email-john.garry@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Родитель
cd6382d827
Коммит
4e666cdb06
|
@ -691,7 +691,7 @@ $(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt)
|
||||||
$(SCRIPTS) : % : %.sh
|
$(SCRIPTS) : % : %.sh
|
||||||
$(QUIET_GEN)$(INSTALL) '$@.sh' '$(OUTPUT)$@'
|
$(QUIET_GEN)$(INSTALL) '$@.sh' '$(OUTPUT)$@'
|
||||||
|
|
||||||
$(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD
|
$(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD ../../.git/ORIG_HEAD
|
||||||
$(Q)$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)
|
$(Q)$(SHELL_PATH) util/PERF-VERSION-GEN $(OUTPUT)
|
||||||
$(Q)touch $(OUTPUT)PERF-VERSION-FILE
|
$(Q)touch $(OUTPUT)PERF-VERSION-FILE
|
||||||
|
|
||||||
|
@ -1144,7 +1144,7 @@ endif
|
||||||
# then force version regeneration:
|
# then force version regeneration:
|
||||||
#
|
#
|
||||||
ifeq ($(wildcard ../../.git/HEAD),)
|
ifeq ($(wildcard ../../.git/HEAD),)
|
||||||
GIT-HEAD-PHONY = ../../.git/HEAD
|
GIT-HEAD-PHONY = ../../.git/HEAD ../../.git/ORIG_HEAD
|
||||||
else
|
else
|
||||||
GIT-HEAD-PHONY =
|
GIT-HEAD-PHONY =
|
||||||
endif
|
endif
|
||||||
|
|
Загрузка…
Ссылка в новой задаче