diff options
| author | Christian Marangi | 2024-10-30 13:05:10 +0000 |
|---|---|---|
| committer | Christian Marangi | 2024-10-30 13:17:34 +0000 |
| commit | def70fa85b242465ee14c69dc6f57cd42f860a5e (patch) | |
| tree | 664d42d4c34908d87d0696887e015c08febbed3a | |
| parent | f303471ae9048ddeb068a64df7aeaab782fb1cb0 (diff) | |
| download | openwrt-def70fa85b242465ee14c69dc6f57cd42f860a5e.tar.gz | |
image: ignore errors from more commands
Ignore errors in more image commands to handle case where the image is
too big and check-image validation fails.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
| -rw-r--r-- | include/image-commands.mk | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/include/image-commands.mk b/include/image-commands.mk index 702cbd8c98..2568fb3ade 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -316,12 +316,12 @@ define Build/elecom-product-header $(eval product=$(word 1,$(1))) $(eval fw=$(if $(word 2,$(1)),$(word 2,$(1)),$@)) - ( \ + -( \ echo -n -e "ELECOM\x00\x00$(product)" | dd bs=40 count=1 conv=sync; \ echo -n "0.00" | dd bs=16 count=1 conv=sync; \ dd if=$(fw); \ - ) > $(fw).new - mv $(fw).new $(fw) + ) > $(fw).new \ + && mv $(fw).new $(fw) || rm -f $(fw) endef define Build/elecom-wrc-gs-factory @@ -351,10 +351,10 @@ define Build/elx-header echo -ne "$$($(MKHASH) md5 $@ | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \ dd bs=58 count=1 conv=sync; \ ) > $(KDIR)/tmp/$(DEVICE_NAME).header - $(call Build/xor-image,-p $(xor_pattern) -x) - cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new - mv $@.new $@ - rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header + -$(call Build/xor-image,-p $(xor_pattern) -x) \ + && cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new \ + && mv $@.new $@ \ + && rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header endef define Build/eva-image @@ -614,8 +614,8 @@ define Build/seama-seal endef define Build/senao-header - $(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new - mv $@.new $@ + -$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new \ + && mv $@.new $@ || rm -f $@ endef define Build/sysupgrade-tar @@ -718,8 +718,8 @@ define Build/multiImage endef define Build/xor-image - $(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) - mv $@.xor $@ + -$(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) \ + && mv $@.xor $@ || rm -f $@ endef define Build/zip |