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

Merge "Only consider EXTRA_INSTALL_ZIPS relevant by their primary file" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-05-13 22:56:46 +00:00
committed by Gerrit Code Review
parent db0c8d7986 5cba391313
commit a4b1e92ee0
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/Makefile
View File

@@ -3406,12 +3406,12 @@ endif
FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT) FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)
# Returns a list of all the zip files from EXTRA_INSTALL_ZIPS whose install destination is # Returns a list of EXTRA_INSTALL_ZIPS trios whose primary file is contained within $(1)
# under $(1) # The trios will contain the primary installed file : the directory to unzip the zip to : the zip
define relevant-extra-install-zips define relevant-extra-install-zips
$(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \ $(strip $(foreach p,$(EXTRA_INSTALL_ZIPS), \
$(if $(filter $(1)/%,$(call word-colon,1,$(p))/), \ $(if $(filter $(call word-colon,1,$(p)),$(1)), \
$(call word-colon,2,$(p))))) $(p))))
endef endef
# Writes a text file that contains all of the files that will be inside a partition. # Writes a text file that contains all of the files that will be inside a partition.
@@ -3423,12 +3423,13 @@ 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): $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(call relevant-extra-install-zips,$(2)) $(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,$$(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) $$(EXTRA_INSTALL_ZIPS) >> $$@ $$(HOST_OUT_EXECUTABLES)/extra_install_zips_file_list $(2) $$(PRIVATE_RELEVANT_EXTRA_INSTALL_ZIPS) >> $$@
endef endef
# ----------------------------------------------------------------- # -----------------------------------------------------------------