Current squashfs snapshot images are improperly padded by just 128k,
which doesn't correspond with TARGET_ROOTFS_PARTSIZE=256 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 <yn...@true.cz>
---
target/linux/x86/image/Makefile | 15 ++-------------
1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 0771547..84b0da7 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
@@ -141,20 +137,13 @@ ifneq ($(CONFIG_VMDK_IMAGES),)
endef
endif
+$(eval $(call Image/gzip-ext4-padded-squashfs))
+
define Image/Build/gzip
gzip -f9n $(BIN_DIR)/$(IMG_COMBINED)-$(1).img
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
-
define Image/BuildKernel
$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
endef
--
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
