RepoMirrors
/
openwrt
mirror of git://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Christian Marangi 2024-10-30 14:05:10 +01:00
parent f303471ae9
commit def70fa85b
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/image-commands.mk
View File

@ -316,12 +316,12 @@ define Build/elecom-product-header
$(eval product=$(word 1,$(1))) $(eval product=$(word 1,$(1)))
$(eval fw=$(if $(word 2,$(1)),$(word 2,$(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 -e "ELECOM\x00\x00$(product)" | dd bs=40 count=1 conv=sync; \
echo -n "0.00" | dd bs=16 count=1 conv=sync; \ echo -n "0.00" | dd bs=16 count=1 conv=sync; \
dd if=$(fw); \ dd if=$(fw); \
) > $(fw).new ) > $(fw).new \
mv $(fw).new $(fw) && mv $(fw).new $(fw) || rm -f $(fw)
endef endef
define Build/elecom-wrc-gs-factory 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')" | \ echo -ne "$$($(MKHASH) md5 $@ | fold -s2 | xargs -I {} echo \\x{} | tr -d '\n')" | \
dd bs=58 count=1 conv=sync; \ dd bs=58 count=1 conv=sync; \
) > $(KDIR)/tmp/$(DEVICE_NAME).header ) > $(KDIR)/tmp/$(DEVICE_NAME).header
$(call Build/xor-image,-p $(xor_pattern) -x) -$(call Build/xor-image,-p $(xor_pattern) -x) \
cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new && cat $(KDIR)/tmp/$(DEVICE_NAME).header $@ > $@.new \
mv $@.new $@ && mv $@.new $@ \
rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header && rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header
endef endef
define Build/eva-image define Build/eva-image
@ -614,8 +614,8 @@ define Build/seama-seal
endef endef
define Build/senao-header define Build/senao-header
$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new -$(STAGING_DIR_HOST)/bin/mksenaofw $(1) -e $@ -o $@.new \
mv $@.new $@ && mv $@.new $@ || rm -f $@
endef endef
define Build/sysupgrade-tar define Build/sysupgrade-tar
@ -718,8 +718,8 @@ define Build/multiImage
endef endef
define Build/xor-image define Build/xor-image
$(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) -$(STAGING_DIR_HOST)/bin/xorimage -i $@ -o $@.xor $(1) \
mv $@.xor $@ && mv $@.xor $@ || rm -f $@
endef endef
define Build/zip define Build/zip