From: Gabor Juhos <juhosg@openwrt.org>
Date: Fri, 24 Jan 2014 11:59:32 +0000 (+0000)
Subject: ar71xx: image: fix size verification in the CatFiles macro
X-Git-Tag: reboot~8089
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4556632578f271ac283ca2caa7272c1eb6a04f68;p=openwrt%2Fstaging%2Fblogic.git

ar71xx: image: fix size verification in the CatFiles macro

The macro checks the size of the rootfs image even if
the second parameter of the macro contains the size of
an eraseblock. It is wrong because the size of the
kernel image will be adjusted to the next eraseblock
and the resulting image might be too large.

Fix the macro to check the size of the final image
instead of the rootfs image.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 39383
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 2a003a82b3c8..39e935d11b77 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -141,13 +141,21 @@ define CatFiles
 			echo "Warning: $(5) is too big (> $(4) bytes)" >&2; \
 			rm -f $(5); \
 		fi; \
-	else if [ $(2) -gt 262144 -a `stat -c%s "$(1)"` -gt $(2) ]; then \
-		echo "Warning: $(1) is too big (> $(2) bytes)" >&2; \
-	else if [ `stat -c%s $(3)` -gt $(4) ]; then \
-		echo "Warning: $(3) is too big (> $(4) bytes)" >&2; \
+	else if [ $(2) -gt 262144 ]; then \
+		if [ `stat -c%s "$(1)"` -gt $(2) ]; then \
+			echo "Warning: $(1) is too big (> $(2) bytes)" >&2; \
+		else if [ `stat -c%s $(3)` -gt $(4) ]; then \
+			echo "Warning: $(3) is too big (> $(4) bytes)" >&2; \
+		else \
+			( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
+		fi; fi; \
 	else \
 		( dd if=$(1) bs=$(2) conv=sync; dd if=$(3) ) > $(5); \
-	fi; fi; fi
+		if [ `stat -c%s $(5)` -gt $(4) ]; then \
+			echo "Warning: $(5) is too big (> $(4) bytes)" >&2; \
+			rm -f $(5); \
+		fi; \
+	fi; fi
 endef
 
 Sysupgrade/KR=$(call CatFiles,$(2),$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(5)))