From: Imre Kaloz <kaloz@openwrt.org>
Date: Fri, 26 Dec 2014 13:33:22 +0000 (+0000)
Subject: The ubinized filesystems should be used for generating the final images, so store... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f3755f57584bf1b0273c527964a0ea8ac43fd13d;p=openwrt%2Fstaging%2Flinusw.git

The ubinized filesystems should be used for generating the final images, so store them in KDIR instead.

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 43778
---

diff --git a/include/image.mk b/include/image.mk
index 12322bdb8d..f9b8998ed4 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -154,7 +154,7 @@ ifneq ($(CONFIG_NAND_SUPPORT),)
    define Image/Build/UbinizeImage
 	sh $(TOPDIR)/scripts/ubinize-image.sh $(2) \
 		"$(KDIR)/root.$(3)" \
-		"$(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
+		"$(KDIR)/$(IMG_PREFIX)-$(1)-$(3)-ubinized.bin" \
 		$(4)
    endef
 
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 9d3b6353a6..c2dcd8cd06 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -46,7 +46,7 @@ define Image/Build/squashfs
 	$(foreach dtb,$(TARGET_DTBS),$(call Image/Build/UbinizeImage,$(dtb),,squashfs,$(UBI_OPTS));)
 	( \
 		dd if=$(KDIR)/uImage-armada-xp-mamba bs=3072k conv=sync; \
-		dd if=$(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \
+		dd if=$(KDIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-ubinized.bin \
 		bs=2048 conv=sync; \
 	) > $(BIN_DIR)/$(IMG_PREFIX)-armada-xp-mamba-squashfs-factory.img
 endef