ixp4xx: fix imagebuilder

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

diff --git a/package/boot/apex/Makefile b/package/boot/apex/Makefile
index 1a1ab1b28b6cfbdd090d3e48285471f880931a66..f154f9606e691687dc64187561e5e77867540dd6 100644 (file)
--- 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 7488d757b62411dc97a89678f32bce35ec536fb4..bbd62f05138b8fbca20f4a12b771d4e2be67854f 100644 (file)
--- 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