From 590be1fd872e39b54a3bd23949e76b7af375b68b Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 29 May 2015 12:20:39 +0000
Subject: [PATCH] ixp4xx: fix imagebuilder

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

SVN-Revision: 45826
---
 package/boot/apex/Makefile         | 5 +++++
 target/linux/ixp4xx/image/Makefile | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/package/boot/apex/Makefile b/package/boot/apex/Makefile
index 1a1ab1b28b..f154f9606e 100644
--- a/package/boot/apex/Makefile
+++ b/package/boot/apex/Makefile
@@ -6,6 +6,7 @@
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=apex
 PKG_VERSION:=1.6.9
@@ -54,4 +55,8 @@ define Package/apex/install
 	$(CP) $(PKG_BUILD_DIR)/out/*.bin $(1)/
 endef
 
+define Build/InstallDev
+	$(CP) $(PKG_BUILD_DIR)/out/*.bin $(KERNEL_BUILD_DIR)
+endef
+
 $(eval $(call BuildPackage,apex))
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
index 7488d757b6..bbd62f0513 100644
--- a/target/linux/ixp4xx/image/Makefile
+++ b/target/linux/ixp4xx/image/Makefile
@@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/image.mk
 ifdef CONFIG_PACKAGE_apex
   define Image/Build/Linksys
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-		-L $(BIN_DIR)/apex/apex-$(2)-armeb.bin \
+		-L $(KDIR)/apex-$(2)-armeb.bin \
 		-k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \
 		-r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
 		-p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1).bin
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-		-F -L $(BIN_DIR)/apex/apex-$(2)-16mb-armeb.bin \
+		-F -L $(KDIR)/apex-$(2)-16mb-armeb.bin \
 		-k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-zImage \
 		-r rootfs:$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
 		-p -o $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(1)-16mb.bin
-- 
2.25.1