Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f075bcbc authored by Colin Cross's avatar Colin Cross
Browse files

package-modules: use && instead of ; between copy commands 

Using ; to join commands in a rule causes failures to be ignored by
make.  Use && instead, and add true at the end as the second operand
to the last && operator.

Also inline copy-test-in-batch, batching is no longer necessary as
kati will fall back to a shell script if the recipe is too long to
fit in a command line.

Test: builds
Change-Id: I4a2528bf2a15106cfabaae0336662c4a0464271d
parent 77dab1ed

core/tasks/tools/package-modules.mk

+5 −15
Original line number Diff line number Diff line
@@ -48,26 +48,16 @@ $(foreach m,$(my_modules_and_deps),\ 
      $(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): PRIVATE_COPY_PAIRS := $(my_copy_pairs)

$(my_package_zip): PRIVATE_PICKUP_FILES := $(my_pickup_files)

$(my_package_zip) : $(my_built_modules)

	@echo "Package $@"

	@rm -rf $(dir $@) && mkdir -p $(dir $@)

	$(call copy-tests-in-batch,$(wordlist 1,200,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 201,400,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 401,600,$(PRIVATE_COPY_PAIRS)))

	$(call copy-tests-in-batch,$(wordlist 601,800,$(PRIVATE_COPY_PAIRS)))

	$(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)))

	$(foreach p, $(PRIVATE_COPY_PAIRS),\

	  $(eval pair := $(subst :,$(space),$(p)))\

	  mkdir -p $(dir $(word 2,$(pair))) && \

	  cp -Rf $(word 1,$(pair)) $(word 2,$(pair)) && ) true

	$(hide) $(foreach f, $(PRIVATE_PICKUP_FILES),\

	  cp -RfL $(f) $(dir $@);)

	  cp -RfL $(f) $(dir $@) && ) true

	$(hide) cd $(dir $@) && zip -rqX $(notdir $@) *