From: John Crispin <john@openwrt.org>
Date: Fri, 29 May 2015 11:28:33 +0000 (+0000)
Subject: gemini: fix imagebuilder
X-Git-Tag: reboot~2928
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1985e88b359d5f343cb45cba6bd27698b8e81e92;p=openwrt%2Fstaging%2Fjogo.git

gemini: fix imagebuilder

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 45822
---

diff --git a/target/linux/gemini/image/Makefile b/target/linux/gemini/image/Makefile
index 80fb59e249..7ed1d61f30 100644
--- a/target/linux/gemini/image/Makefile
+++ b/target/linux/gemini/image/Makefile
@@ -21,8 +21,8 @@ endif
 ifeq ($(SUBTARGET),raidsonic)
 define Image/Prepare
 # NAS4220: mach id 2038 (0x7F6)
-	echo -en "\x07\x1c\xa0\xe3\xf6\x10\x81\xe3" > $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage
-	cat $(KDIR)/zImage >> $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage
+	echo -en "\x07\x1c\xa0\xe3\xf6\x10\x81\xe3" > $(KDIR)/$(IMG_PREFIX)-nas4220-zImage
+	cat $(KDIR)/zImage >> $(KDIR)/$(IMG_PREFIX)-nas4220-zImage
 endef
 endif
 
@@ -74,7 +74,7 @@ define Image/Build
 	dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img of=$(BIN_DIR)/rd.gz bs=6144k count=1
 #	dd if=/dev/zero of=$(BIN_DIR)/hddapp.tgz bs=6144k count=1
 	dd if=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img of=$(BIN_DIR)/hddapp.tgz bs=6144k count=1 seek=1
-	cp $(BIN_DIR)/$(IMG_PREFIX)-nas4220-zImage $(BIN_DIR)/zImage
+	cp $(KDIR)/$(IMG_PREFIX)-nas4220-zImage $(BIN_DIR)/zImage
 	cp ./ImageInfo-ib4220 $(BIN_DIR)/ImageInfo
 	(cd $(BIN_DIR); tar -czf $(IMG_PREFIX)-sysupgrade-ib4220.tar.gz ImageInfo zImage rd.gz hddapp.tgz)
 	mv $(BIN_DIR)/rd.gz $(BIN_DIR)/$(IMG_PREFIX)-nas4220-rd.gz