[source] uboot-mvebu: also install into KDIR to ensure it packaged in IB

LEDE Commits lede-commits at lists.infradead.org
Mon Sep 26 04:29:16 PDT 2016


jogo pushed a commit to source.git, branch master:
https://git.lede-project.org/bc1f006b4eea84d9f3fb2e9b9c5571557042f697

commit bc1f006b4eea84d9f3fb2e9b9c5571557042f697
Author: Jonas Gorski <jonas.gorski at gmail.com>
AuthorDate: Fri Sep 23 13:45:21 2016 +0200

    uboot-mvebu: also install into KDIR to ensure it packaged in IB
    
    The clearfog image requires u-boot, so package it into KDIR to make sure
    it is available in imageBuilder.
    
    Signed-off-by: Jonas Gorski <jonas.gorski at gmail.com>
    Acked-by: Felix Fietkau <nbd at nbd.name>
---
 package/boot/uboot-mvebu/Makefile | 3 +++
 target/linux/mvebu/image/Makefile | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/package/boot/uboot-mvebu/Makefile b/package/boot/uboot-mvebu/Makefile
index 9554421..3cf6358 100644
--- a/package/boot/uboot-mvebu/Makefile
+++ b/package/boot/uboot-mvebu/Makefile
@@ -71,6 +71,9 @@ define Package/uboot/install/default
 	$(INSTALL_DIR) $(BIN_DIR)/uboot-$(BOARD)-$(1)
 	$(CP) $(PKG_BUILD_DIR)/u-boot-spl.kwb \
 		$(BIN_DIR)/uboot-$(BOARD)-$(1)/openwrt-$(BOARD)-$(1)-u-boot-spl.kwb
+	$(INSTALL_DIR) $(KERNEL_BUILD_DIR)/
+	$(CP) $(PKG_BUILD_DIR)/u-boot-spl.kwb \
+		$(KERNEL_BUILD_DIR)/openwrt-$(BOARD)-$(1)-u-boot-spl.kwb
 	$(INSTALL_DIR) $(BIN_DIR)/u-boot-kwboot/
 	$(CP) $(PKG_BUILD_DIR)/tools/kwboot \
 		$(BIN_DIR)/u-boot-kwboot/
diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 9509c19..cf9d3c0 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -49,7 +49,7 @@ endef
 define Build/sdcard-img
 	ROOTFS_SIZE=$$(( $(CONFIG_TARGET_ROOTFS_PARTSIZE) * 1024 * 2 )); \
 	./gen_mvebu_sdcard_img.sh $@ \
-		"$(BIN_DIR)/uboot-mvebu-clearfog/openwrt-mvebu-clearfog-u-boot-spl.kwb" \
+		"$(KDIR)/openwrt-mvebu-clearfog-u-boot-spl.kwb" \
 		c 32768 $@.boot \
 		83 $$ROOTFS_SIZE $(IMAGE_ROOTFS)
 endef



More information about the lede-commits mailing list