From a17d9482f5e218da2c0bcaa41662f355ee32be07 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Thu, 28 Mar 2019 15:05:25 +0000 Subject: [PATCH] x86: image: fix small disk space in squashfs overlay MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Current squashfs snapshot images are improperly padded by just 128k, which doesn't correspond with TARGET_ROOTFS_PARTSIZE=128 default config option, leading to following: Filesystem Size Used Available Use% Mounted on /dev/root 2.5M 2.5M 0 100% /rom /dev/loop0 85.0K 9.0K 71.0K 11% /overlay overlayfs:/overlay 85.0K 9.0K 71.0K 11% / Signed-off-by: Petr Å tetiar --- target/linux/x86/image/Makefile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 0771547f29a5..24825f2ba2c2 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -93,10 +93,6 @@ ifneq ($(CONFIG_GRUB_IMAGES),) endef endif -define Image/Build/squashfs - dd if=/dev/zero bs=128k count=1 >> $(KDIR)/root.squashfs -endef - define Image/Build/iso $(INSTALL_DIR) $(KDIR)/root.grub/boot/grub $(KDIR)/grub2 $(CP) $(KDIR)/bzImage $(KDIR)/root.grub/boot/vmlinuz @@ -146,14 +142,7 @@ define Image/Build/gzip gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img endef -ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) - define Image/Build/gzip/ext4 - $(call Image/Build/gzip,ext4) - endef - define Image/Build/gzip/squashfs - $(call Image/Build/gzip,squashfs) - endef -endif +$(eval $(call Image/gzip-ext4-padded-squashfs)) define Image/BuildKernel $(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz -- 2.30.2