ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-23 23:42:43 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

image: ignore errors from mktplinkfw command

Browse Source 
Rework tplink-v2-header and tplink-v2-image Build define to ignore error
if mktplinkfw2 errors out.

This is to handle situation when the image is too big and can't be
generated or prev check-image calls deleted the source file as it's too
big.

This aligns to the pattern used by tplink-v1-image.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi 2024-10-30 11:21:58 +01:00
parent 618f079f5d
commit 5ba701fe19
No known key found for this signature in database
GPG Key ID: AC001D09ADBFEAD7
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/image-commands.mk
View File

@ -666,23 +666,22 @@ define Build/tplink-v1-image
endef endef
define Build/tplink-v2-header define Build/tplink-v2-header
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \ -$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
-c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \ -c -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -L $(KERNEL_LOADADDR) \
-E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ -E $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \
-w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \ -w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
-T $(TPLINK_HVERSION) -V "ver. 2.0" \ -T $(TPLINK_HVERSION) -V "ver. 2.0" \
-k $@ -o $@.new $(1) -k $@ -o $@.new $(1) \
@mv $@.new $@ && mv $@.new $@ || rm -f $@
endef endef
define Build/tplink-v2-image define Build/tplink-v2-image
$(STAGING_DIR_HOST)/bin/mktplinkfw2 \ -$(STAGING_DIR_HOST)/bin/mktplinkfw2 \
-H $(TPLINK_HWID) -W $(TPLINK_HWREV) \ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) \
-w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \ -w $(TPLINK_HWREVADD) -F "$(TPLINK_FLASHLAYOUT)" \
-T $(TPLINK_HVERSION) -V "ver. 2.0" -a 0x4 -j \ -T $(TPLINK_HVERSION) -V "ver. 2.0" -a 0x4 -j \
-k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new $(1) -k $(IMAGE_KERNEL) -r $(IMAGE_ROOTFS) -o $@.new $(1) \
cat $@.new >> $@ && cat $@.new >> $@ && rm -rf $@.new || rm -f $@
rm -rf $@.new
endef endef
define Build/uImage define Build/uImage