From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 27 Jan 2017 15:32:41 +0000 (+0100)
Subject: ixp4xx: put apex images into image staging directory
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=475da81ec01701d1443ad65152bee63bae981fdd;p=openwrt%2Fstaging%2Fnoltari.git

ixp4xx: put apex images into image staging directory

Do not put the apex images into the kernel build directory as this directory
might get removed after kernel updates while the apex packages InstallDev
recipe is not getting re-executed because it is still considered current,
leading to image build failures later on due to missing images.

To ensure that built bootloader images persist over kernel version updates in
the buildroot, put them into the new STAGING_DIR_IMAGE directory.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/package/boot/apex/Makefile b/package/boot/apex/Makefile
index fb3c77c37c..d90df8e58c 100644
--- a/package/boot/apex/Makefile
+++ b/package/boot/apex/Makefile
@@ -56,7 +56,8 @@ define Package/apex/install
 endef
 
 define Build/InstallDev
-	$(CP) $(PKG_BUILD_DIR)/out/*.bin $(KERNEL_BUILD_DIR)
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+	$(CP) $(PKG_BUILD_DIR)/out/*.bin $(STAGING_DIR_IMAGE)/
 endef
 
 $(eval $(call BuildPackage,apex))
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
index 7ec842064e..5b6ff0b08e 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 $(KDIR)/apex-$(2)-armeb.bin \
+		-L $(STAGING_DIR_IMAGE)/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 $(KDIR)/apex-$(2)-16mb-armeb.bin \
+		-F -L $(STAGING_DIR_IMAGE)/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