From 53f4a686aa8d0740c0a5b8626da6435c130de8d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Thu, 28 Mar 2019 14:34:26 +0000 Subject: [PATCH] armvirt: fix overlay support by updating to f2fs/ext4 based overlays MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Current snapshot images doesn't provide images with usable overlay filesystems: mount_root: no usable overlay filesystem found, using tmpfs overlay So this patch fixes this by updating support to current f2fs/ext4 based overlays and providing squashfs with proper rootfs TARGET_ROOTFS_PARTSIZE size. While at it, I've also added support for optional gzipping of the images, and renamed the output rootfs image filenames to match the more common naming pattern $(IMG_PREFIX)-rootfs-$(FS-TYPE).img. Cc: Yousong Zhou Signed-off-by: Petr Å tetiar --- target/linux/armvirt/Makefile | 2 ++ target/linux/armvirt/image/Makefile | 10 ++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/target/linux/armvirt/Makefile b/target/linux/armvirt/Makefile index 9a67ab66a4..44d4ece224 100644 --- a/target/linux/armvirt/Makefile +++ b/target/linux/armvirt/Makefile @@ -17,4 +17,6 @@ KERNEL_PATCHVER:=4.19 include $(INCLUDE_DIR)/target.mk +DEFAULT_PACKAGES += mkf2fs e2fsprogs + $(eval $(call BuildTarget)) diff --git a/target/linux/armvirt/image/Makefile b/target/linux/armvirt/image/Makefile index 73d9145e0e..0292dbab42 100644 --- a/target/linux/armvirt/image/Makefile +++ b/target/linux/armvirt/image/Makefile @@ -19,10 +19,16 @@ define Image/Build/Initramfs ) endef +define Image/Build/gzip + gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img +endef + +$(eval $(call Image/gzip-ext4-padded-squashfs)) + define Image/Build $(call Image/Build/$(1)) - dd if=$(KDIR)/root.$(1) bs=128k conv=sync | \ - gzip -9n >$(BIN_DIR)/$(IMG_PREFIX)-root.$(1).gz + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img + $(call Image/Build/gzip/$(1)) endef $(eval $(call BuildImage)) -- 2.25.1