EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mvebu: put u-boot images into image staging directory

Browse Source 
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 u-boot 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>
This commit is contained in:
Jo-Philipp Wich 2017-01-27 13:14:12 +01:00
parent 7d57db4d9b
commit 237bd36135
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/boot/uboot-mvebu/Makefile
View File

@ -31,8 +31,8 @@ UBOOT_TARGETS:= \
clearfog clearfog
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(KERNEL_BUILD_DIR)/ $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(KERNEL_BUILD_DIR)/$(BUILD_VARIANT)-u-boot-spl.kwb $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-u-boot-spl.kwb
endef endef
$(eval $(call BuildPackage/U-Boot)) $(eval $(call BuildPackage/U-Boot))

2
target/linux/mvebu/image/Makefile
View File

@ -39,7 +39,7 @@ endef
define Build/sdcard-img define Build/sdcard-img
ROOTFS_SIZE=$$(( $(CONFIG_TARGET_ROOTFS_PARTSIZE) * 1024 * 2 )); \ ROOTFS_SIZE=$$(( $(CONFIG_TARGET_ROOTFS_PARTSIZE) * 1024 * 2 )); \
./gen_mvebu_sdcard_img.sh $@ \ ./gen_mvebu_sdcard_img.sh $@ \
"$(KDIR)/clearfog-u-boot-spl.kwb" \ "$(STAGING_DIR_IMAGE)/clearfog-u-boot-spl.kwb" \
c 32768 $@.boot \ c 32768 $@.boot \
83 $$ROOTFS_SIZE $(IMAGE_ROOTFS) 83 $$ROOTFS_SIZE $(IMAGE_ROOTFS)
endef endef