Selaa lähdekoodia

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 <[email protected]>
Jo-Philipp Wich 9 vuotta sitten
vanhempi
sitoutus
35be928466
1 muutettua tiedostoa jossa 7 lisäystä ja 1 poistoa
  1. 7 1
      target/linux/imx6/image/Makefile

+ 7 - 1
target/linux/imx6/image/Makefile

@@ -37,10 +37,16 @@ define Build/boot-overlay
 		--space-fixup --force-compr=zlib --squash-uids \
 		--space-fixup --force-compr=zlib --squash-uids \
 		$(MKUBIFS_OPTS) -c 8124 \
 		$(MKUBIFS_OPTS) -c 8124 \
 		-o [email protected] -d [email protected]
 		-o [email protected] -d [email protected]
+
+	$(TAR) -C [email protected] -cf [email protected] .
 endef
 endef
 
 
 define Build/bootfs.tar.gz
 define Build/bootfs.tar.gz
-	$(TAR) -C $(IMAGE_KERNEL).boot \
+	rm -rf [email protected]
+	mkdir -p [email protected]
+
+	$(TAR) -C [email protected] -xf $(IMAGE_KERNEL).boot.tar
+	$(TAR) -C [email protected] \
 		--numeric-owner --owner=0 --group=0 --transform "s,./,./boot/," \
 		--numeric-owner --owner=0 --group=0 --transform "s,./,./boot/," \
 		-czvf $@ .
 		-czvf $@ .
 endef
 endef