StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reference target-specific variable from dependency list

Browse Source 
Apprently target-specific variables are only valid for the body of
the target, not its dependency list, so the dependency on the zip file
wasn't being added.

Bug: 340392832
Test: m, rm file_list.txt and the zip file, m again, and ensure we don't get an error that the zip file doesn't exist
Change-Id: Idaca6606ff24055aa98c78ca1206b587cc1df4d2
This commit is contained in:
Cole Faust
2024-05-17 13:56:27 -07:00
parent a65a617855
commit bb1d4a431d
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/Makefile
View File

@@ -3423,13 +3423,12 @@ endef
# $(2): The partition's staging directory # $(2): The partition's staging directory
# $(3): Files to include in the partition # $(3): Files to include in the partition
define write-partition-file-list define write-partition-file-list
$(1): PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS := $(call relevant-extra-install-zips,$(filter $(2)/%,$(3))) $(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(foreach p,$(call relevant-extra-install-zips,$(filter $(2)/%,$(3))),$(call word-colon,3,$(p)))
$(1): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $$(foreach p,$$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS),$$(call word-colon,3,$$(p)))
@echo Writing $$@ @echo Writing $$@
rm -f $$@ rm -f $$@
echo -n > $$@ echo -n > $$@
$$(foreach f,$(subst $(2)/,,$(filter $(2)/%,$(3))),echo "$$(f)" >> $$@$$(newline)) $$(foreach f,$(subst $(2)/,,$(filter $(2)/%,$(3))),echo "$$(f)" >> $$@$$(newline))
$$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS) >> $$@ $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $(call relevant-extra-install-zips,$(filter $(2)/%,$(3))) >> $$@
endef endef
# ----------------------------------------------------------------- # -----------------------------------------------------------------