From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 1 Dec 2016 13:42:03 +0000 (+0100)
Subject: orion: make image size errors non-fatal
X-Git-Tag: v17.01.0-rc1~613
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1a63b819658d893f4454bbe75811a1f91cbfc07e;p=oweals%2Fopenwrt.git

orion: make image size errors non-fatal

Fixes build errors on the generic subtarget

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/target/linux/orion/image/generic.mk b/target/linux/orion/image/generic.mk
index 18ea3991e9..22909ac73d 100644
--- a/target/linux/orion/image/generic.mk
+++ b/target/linux/orion/image/generic.mk
@@ -110,7 +110,7 @@ endef
 
 define Image/Default/FileSizeCheck
  # parameters: 1 = file path, 2 = maximum size in bytes
-	[ `stat -c %s '$(1)'` -le $(2) ] || { echo '   ERROR: $(1) too big (> $(2) bytes)'; exit 1; }
+	[ `stat -c %s '$(1)'` -le $(2) ] || { echo '   ERROR: $(1) too big (> $(2) bytes)'; rm -f $(1); }
 endef
 
 
@@ -215,18 +215,14 @@ define Image/Build/Linksys/wrt350nv2-builder
 	)
 	echo '#version 0x2020' >> '$(TMP_DIR)/$(2)_factory/$(2).par'
  # create bin file for recovery and factory image
-	( \
+	-( \
 		cd '$(TMP_DIR)/$(2)_factory'; \
 		'$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -b '$(TMP_DIR)/$(2)_factory/$(2).par'; \
-	)
- # copy bin file as recovery image
-	$(CP) '$(TMP_DIR)/$(2)_factory/wrt350n.bin' '$(BIN_DIR)/openwrt-$(2)-$(1)-recovery.bin'
- # create factory image for stock firmware update mechanism
+	) && $(CP) '$(TMP_DIR)/$(2)_factory/wrt350n.bin' '$(BIN_DIR)/openwrt-$(2)-$(1)-recovery.bin' && \
 	( \
 		cd '$(TMP_DIR)/$(2)_factory'; \
 		zip 'wrt350n.zip' 'wrt350n.bin'; \
-	)
-	'$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -z '$(TMP_DIR)/$(2)_factory/wrt350n.zip' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img'
+	) && '$(STAGING_DIR_HOST)/bin/wrt350nv2-builder' -z '$(TMP_DIR)/$(2)_factory/wrt350n.zip' '$(BIN_DIR)/openwrt-$(2)-$(1)-factory.img'
 	rm -rf '$(TMP_DIR)/$(2)_factory'
 endef