From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 22 Mar 2011 18:56:55 +0000 (+0000)
Subject: fix image generation in the Image Builder environment
X-Git-Tag: reboot~17155
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=771d6f18f64a6213e147c2a31b128127aa5d4812;p=openwrt%2Fstaging%2Fxback.git

fix image generation in the Image Builder environment

SVN-Revision: 26271
---

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 678d46e096..197532b690 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -394,6 +394,8 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
 		echo "Warning: $(KDIR)/vmlinux-$(2).bin.lzma is too big"; \
 	else if [ `stat -c%s $(KDIR)/root.$(1)` -gt 2752512 ]; then \
 		echo "Warning: $(KDIR)/root.$(1) is too big"; \
+	else if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
+		echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found"; \
 	else \
 		mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
 			0x80060000 \
@@ -408,7 +410,7 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
 			-b $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin \
 			-r $(call imgname,$(1),$(2))-sysupgrade.bin:0x10000 \
 			-o $(call imgname,$(1),$(2))-factory.bin; \
-	fi; fi
+	fi; fi; fi
   endef
 endif