Author: nbd
Date: 2015-05-08 16:02:50 +0200 (Fri, 08 May 2015)
New Revision: 45646

Modified:
   trunk/target/linux/ar71xx/image/Makefile
Log:
ar71xx: allow mktplinkfw calls from the new image code to fail (because of 
oversized images)

Signed-off-by: Felix Fietkau <[email protected]>

Modified: trunk/target/linux/ar71xx/image/Makefile
===================================================================
--- trunk/target/linux/ar71xx/image/Makefile    2015-05-08 14:02:43 UTC (rev 
45645)
+++ trunk/target/linux/ar71xx/image/Makefile    2015-05-08 14:02:50 UTC (rev 
45646)
@@ -51,15 +51,14 @@
 # -s strip padding from end of the image
 # -X reserve <size> bytes in the firmware image (hexval prefixed with 0x)
 define Build/mktplinkfw
-       $(STAGING_DIR_HOST)/bin/mktplinkfw \
+       -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) 
-N OpenWrt -V $(REVISION) \
                -k $(word 1,$^) \
                -r $@ \
                -o [email protected] \
                -j -X 0x40000 \
                -a $(call rootfs_align,$(FILESYSTEM)) \
-               $(if $(findstring sysupgrade,$1),-s)
-       @mv [email protected] $@
+               $(if $(findstring sysupgrade,$1),-s) && mv [email protected] $@ || rm -f $@
 endef
 
 # -c combined image
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to