KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

oxnas: 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 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 16:21:17 +01:00
parent cf3d1b61bf
commit 7f9d537f21
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-oxnas/Makefile
View file

@ -29,8 +29,8 @@ endef
UBOOT_TARGETS:=ox820 UBOOT_TARGETS:=ox820
define Build/InstallDev define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/u-boot.bin \ $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(KERNEL_BUILD_DIR)/u-boot.bin $(CP) $(PKG_BUILD_DIR)/u-boot.bin $(STAGING_DIR_IMAGE)/u-boot.bin
endef endef
$(eval $(call BuildPackage/U-Boot)) $(eval $(call BuildPackage/U-Boot))

2
target/linux/oxnas/image/Makefile
View file

@ -15,7 +15,7 @@ DEVICE_VARS += DTS UBIFS_OPTS
KERNEL_LOADADDR := 0x60008000 KERNEL_LOADADDR := 0x60008000
define Build/ubootable define Build/ubootable
(dd if="$(KDIR)/u-boot.bin" bs=128k conv=sync; \ (dd if="$(STAGING_DIR_IMAGE)/u-boot.bin" bs=128k conv=sync; \
dd if="$@" bs=128k conv=sync ) >> $@.new dd if="$@" bs=128k conv=sync ) >> $@.new
@mv "$@.new" "$@" @mv "$@.new" "$@"
endef endef