From: Gabor Juhos <juhosg@openwrt.org>
Date: Mon, 5 Dec 2011 12:47:53 +0000 (+0000)
Subject: ar71xx: allow WNDR3700 image creation to fail if kernel/rootfs too big
X-Git-Tag: reboot~15386
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a3a60fc643c8630752e56e2ce9332b128e138e5;p=oweals%2Fopenwrt.git

ar71xx: allow WNDR3700 image creation to fail if kernel/rootfs too big

SVN-Revision: 29431
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 411fd16296..32c1b24c17 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -384,26 +384,24 @@ define Image/Build/Netgear
 	if [ `stat -c%s '$(KDIR)/vmlinux-$(2).uImage.squashfs'` -gt \
 	     `cat '$(KDIR)/$(2)_kernel_maxsize'` ]; then \
                 echo "$(KDIR)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
-		false; \
-	fi
-	if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
+	else if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
 	     `cat '$(KDIR)/$(2)_rootfs_maxsize'` ]; then \
                 echo "$(KDIR)/root.$(1) is too big" >& 2; \
-		false; \
-	fi
-	( \
-		set -e; \
-		dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \
-		   bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \
-		dd if=$(KDIR)/root.$(1) bs=64k; \
-	) > $(call sysupname,$(1),$(2))
-	for r in $(7) ; do \
-		[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
-		$(STAGING_DIR_HOST)/bin/mkdniimg \
-			-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
-			-i $(call sysupname,$(1),$(2)) \
-			-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
-	done
+	else \
+		( \
+			set -e; \
+			dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \
+			bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \
+			dd if=$(KDIR)/root.$(1) bs=64k; \
+		) > $(call sysupname,$(1),$(2)); \
+		for r in $(7) ; do \
+			[ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+			$(STAGING_DIR_HOST)/bin/mkdniimg \
+				-B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+				-i $(call sysupname,$(1),$(2)) \
+				-o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+		done; \
+	fi; fi
 endef
 
 define Image/Build/Netgear/initramfs