From: Jo-Philipp Wich Date: Sat, 20 Aug 2016 18:17:51 +0000 (+0200) Subject: imx6: fix generating bootfs in imagebuilder (FS#102) X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=35be9284668d19a565d354a33febb508b0e28131;p=openwrt%2Fstaging%2Flynxis%2Fomap.git imx6: fix generating bootfs in imagebuilder (FS#102) The image builder does not bundle sub-directories within $(KERNEL_BUILD_DIR), therfore the intermediate "ventana-uImage.boot" directory is not shipped, leading to failures with "make image" later on. To circumvent the issue, store the intermediate boot files as tar archive instead of putting them into a directory to ensure that they end up in the final image builder tarball. Fixes FS#102 Signed-off-by: Jo-Philipp Wich --- diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index 2181ea5db4..6b66376d41 100644 --- a/target/linux/imx6/image/Makefile +++ b/target/linux/imx6/image/Makefile @@ -37,10 +37,16 @@ define Build/boot-overlay --space-fixup --force-compr=zlib --squash-uids \ $(MKUBIFS_OPTS) -c 8124 \ -o $@.boot.ubifs -d $@.boot + + $(TAR) -C $@.boot -cf $@.boot.tar . endef define Build/bootfs.tar.gz - $(TAR) -C $(IMAGE_KERNEL).boot \ + rm -rf $@.boot + mkdir -p $@.boot + + $(TAR) -C $@.boot -xf $(IMAGE_KERNEL).boot.tar + $(TAR) -C $@.boot \ --numeric-owner --owner=0 --group=0 --transform "s,./,./boot/," \ -czvf $@ . endef