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

Break package-modules build recipe to mutliple lines

Browse Source 
To fix "Argument list too long" error seen on some machines.

Change-Id: I6f34668e938412751e257b4b543358e1fc0809a1
This commit is contained in:
Ying Wang
2014-09-23 21:50:12 -07:00
parent 4cb0499a5d
commit a47420a22d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/tasks/tools/package-modules.mk
View File

@@ -37,16 +37,26 @@ $(foreach m,$(my_modules),\
$(eval my_copy_pairs += $(bui):$(my_staging_dir)/$(my_copy_dest)))\ $(eval my_copy_pairs += $(bui):$(my_staging_dir)/$(my_copy_dest)))\
)) ))
define copy-tests-in-batch
$(hide) $(foreach p, $(1),\
$(eval pair := $(subst :,$(space),$(p)))\
mkdir -p $(dir $(word 2,$(pair)));\
cp -rf $(word 1,$(pair)) $(word 2,$(pair));)
endef
my_package_zip := $(my_staging_dir)/$(my_package_name).zip my_package_zip := $(my_staging_dir)/$(my_package_name).zip
$(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs) $(my_package_zip): PRIVATE_COPY_PAIRS := $(my_copy_pairs)
$(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files) $(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)
$(my_package_zip) : $(my_built_modules) $(my_package_zip) : $(my_built_modules)
@echo "Package $@" @echo "Package $@"
@rm -rf $(dir $@) && mkdir -p $(dir $@) @rm -rf $(dir $@) && mkdir -p $(dir $@)
$(hide) $(foreach p, $(PRIVATE_COPY_PAIRS), \ $(call copy-tests-in-batch,$(wordlist 1,200,$(PRIVATE_COPY_PAIRS)))
$(eval pair := $(subst :,$(space),$(p)))\ $(call copy-tests-in-batch,$(wordlist 201,400,$(PRIVATE_COPY_PAIRS)))
mkdir -p $(dir $(word 2,$(pair))); \ $(call copy-tests-in-batch,$(wordlist 401,600,$(PRIVATE_COPY_PAIRS)))
cp -rf $(word 1,$(pair)) $(word 2,$(pair));) $(call copy-tests-in-batch,$(wordlist 601,800,$(PRIVATE_COPY_PAIRS)))
$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES), \ $(call copy-tests-in-batch,$(wordlist 801,1000,$(PRIVATE_COPY_PAIRS)))
$(call copy-tests-in-batch,$(wordlist 1001,1200,$(PRIVATE_COPY_PAIRS)))
$(call copy-tests-in-batch,$(wordlist 1201,9999,$(PRIVATE_COPY_PAIRS)))
$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\
cp -rf $(f) $(dir $@);) cp -rf $(f) $(dir $@);)
$(hide) cd $(dir $@) && zip -rq $(notdir $@) * $(hide) cd $(dir $@) && zip -rq $(notdir $@) *