aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2019-03-27 11:31:14 +0100
committerPetr Štetiar <ynezz@true.cz>2019-06-25 14:12:21 +0000
commitd03ef97c1b57b2b5588115d3b7c7355399874aa3 (patch)
tree066bb76b82d7f3e00fe4701841e566d26acd85b2
parent029c97046468e4a793b5332e999aa42c2e74c84e (diff)
downloadupstream-d03ef97c1b57b2b5588115d3b7c7355399874aa3.tar.gz
upstream-d03ef97c1b57b2b5588115d3b7c7355399874aa3.tar.bz2
upstream-d03ef97c1b57b2b5588115d3b7c7355399874aa3.zip
build: remove TARGET_IMAGES_PAD option
It's being used only in x86 target to produce combined images, where it's mandatory to have padded images in order to produce working squashfs combined images usable in QEMU. Currently we're producing unusable x86 combined squashfs images (18.06.1, 18.06.2 and snapshots) as we don't enable TARGET_IMAGES_PAD, thus providing very small space for the overlay filesystem, leading to the following with OpenWrt 18.06.1 r7258-5eb055306f images on x86 QEMU: root@(none):/# mount | egrep 'root|overlay' /dev/root on /rom type squashfs /dev/loop0 on /overlay type ext4 overlayfs:/overlay on / type overlay root@(none):/# df -h | egrep 'root|overlay|Size' Filesystem Size Used Available Use% Mounted on /dev/root 2.5M 2.5M 0 100% /rom /dev/loop0 113.0K 8.0K 97.0K 8% /overlay overlayfs:/overlay 113.0K 8.0K 97.0K 8% / So we should rather ensure proper image padding in image generation code and we shouldn't rely on config options in order to generate usable images. Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--config/Config-images.in8
1 files changed, 1 insertions, 7 deletions
diff --git a/config/Config-images.in b/config/Config-images.in
index 8548c7cd24..bebfae9156 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -241,23 +241,17 @@ menu "Target Images"
bool "Build VirtualBox image files (VDI)"
depends on TARGET_x86
select GRUB_IMAGES
- select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
config VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends on TARGET_x86
select GRUB_IMAGES
- select TARGET_IMAGES_PAD
select PACKAGE_kmod-e1000
- config TARGET_IMAGES_PAD
- bool "Pad images to filesystem size (for JFFS2)"
- depends on GRUB_IMAGES
-
config TARGET_IMAGES_GZIP
bool "GZip images"
- depends on TARGET_IMAGES_PAD || TARGET_ROOTFS_EXT4FS || TARGET_x86
+ depends on TARGET_ROOTFS_EXT4FS || TARGET_x86
default y
comment "Image Options"