From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 27 Jan 2017 15:26:56 +0000 (+0100)
Subject: mxs: put u-boot images into image staging directory
X-Git-Tag: v18.06.0-rc1~3907
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e0579aecf8de03dd7e529fa14193557014554699;p=openwrt%2Fstaging%2Fxback.git

mxs: put u-boot images into image staging directory

Do not put the u-boot images into the kernel build directory as this directory
might get removed after kernel updates while the u-boot 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/uboot-mxs/Makefile b/package/boot/uboot-mxs/Makefile
index eec78417f2..92cf9e6b27 100644
--- a/package/boot/uboot-mxs/Makefile
+++ b/package/boot/uboot-mxs/Makefile
@@ -38,7 +38,8 @@ UBOOT_TARGETS := \
 UBOOT_MAKE_FLAGS += $(UBOOT_IMAGE)
 
 define Build/InstallDev
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
+	$(INSTALL_DIR) $(STAGING_DIR_IMAGE)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)
 endef
 
 $(eval $(call BuildPackage/U-Boot))
diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index f0f1f6acf3..7c332cd7c2 100644
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -40,7 +40,7 @@ define Image/Build/SDCard-vfat-ext4
 
 	./gen_sdcard_vfat_ext4.sh \
 		$(BIN_DIR)/$(2) \
-		$(KDIR)/$(4)-u-boot.sb \
+		$(STAGING_DIR_IMAGE)/$(4)-u-boot.sb \
 		$(KDIR)/boot.img \
 		$(KDIR)/root.$(1) \
 		$(CONFIG_TARGET_BOOTFS_PARTSIZE) \
@@ -51,7 +51,7 @@ endef
 define Image/Build/SDCard-ext4-ext4
 	./gen_sdcard_ext4_ext4.sh \
 		$(BIN_DIR)/$(2) \
-		$(KDIR)/$(4)-u-boot.sb \
+		$(STAGING_DIR_IMAGE)/$(4)-u-boot.sb \
 		$(KDIR)/root.$(1) \
 		$(CONFIG_TARGET_ROOTFS_PARTSIZE)
 	$(call Image/Gzip,$(BIN_DIR)/$(2))