diff options
| author | Jeongik Cha <jeongik@google.com> | 2023-04-27 11:05:22 +0900 |
|---|---|---|
| committer | Jeongik Cha <jeongik@google.com> | 2023-05-23 07:14:22 +0900 |
| commit | 05210f96b36b2b47d8aa2aff23ca59ade46af8b7 (patch) | |
| tree | 9bcf1ed86c4d6b136a4025bbe6d476c82f243cd8 /packaging | |
| parent | 07cfdab76a70abaaf9ae0d4260f2403415ddd5b5 (diff) | |
| download | build-05210f96b36b2b47d8aa2aff23ca59ade46af8b7.tar.gz | |
BUILD_NUMBER and BUILD_HOSTNAME doesn't affect kati regeneration
* Extract BUILD_NUMBER, BUILD_HOSTNAME to file to avoid kati change
* Handle FILE_NAME_TAG_PLACEHOLDER string in dist in build/make/packaging/distdir.mk
Test: check if kati isn't invoked even though BUILD_NUMBER, BUILD_HOSTNAME
is changed
Test: m && m, and check if the second m is no-op
Bug: 278060169
Change-Id: I1b37760242853c1a145bad255d0bb15524234b25
Merged-In: I1b37760242853c1a145bad255d0bb15524234b25
Diffstat (limited to 'packaging')
| -rw-r--r-- | packaging/distdir.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packaging/distdir.mk b/packaging/distdir.mk index 264a8b098c..c9508af323 100644 --- a/packaging/distdir.mk +++ b/packaging/distdir.mk @@ -18,10 +18,12 @@ DIST_GOAL_OUTPUT_PAIRS := DIST_SRC_DST_PAIRS := include $(KATI_PACKAGE_MK_DIR)/dist.mk +FILE_NAME_TAG := $(file <$(OUT_DIR)/file_name_tag.txt) +.KATI_READONLY := FILE_NAME_TAG $(foreach pair,$(DIST_GOAL_OUTPUT_PAIRS), \ $(eval goal := $(call word-colon,1,$(pair))) \ - $(eval output := $(call word-colon,2,$(pair))) \ + $(eval output := $(subst FILE_NAME_TAG_PLACEHOLDER,$(FILE_NAME_TAG),$(call word-colon,2,$(pair)))) \ $(eval .PHONY: _dist_$$(goal)) \ $(if $(call streq,$(DIST),true),\ $(eval _dist_$$(goal): $$(DIST_DIR)/$$(output)), \ @@ -37,7 +39,7 @@ endef ifeq ($(DIST),true) $(foreach pair,$(DIST_SRC_DST_PAIRS), \ $(eval src := $(call word-colon,1,$(pair))) \ - $(eval dst := $(DIST_DIR)/$(call word-colon,2,$(pair))) \ + $(eval dst := $(subst FILE_NAME_TAG_PLACEHOLDER,$(FILE_NAME_TAG),$(DIST_DIR)/$(call word-colon,2,$(pair)))) \ $(eval $(call copy-one-dist-file,$(src),$(dst)))) endif |