From patchwork Wed Mar 27 15:08:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Petr_=C5=A0tetiar?= X-Patchwork-Id: 1067097 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=true.cz Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="l4pyFeyu"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44TryF0PfSz9sPj for ; Thu, 28 Mar 2019 02:09:41 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=kuv1MCL34lQ5aO3DEz7iJXPkWB+ALs4eS2BN7D0Bnq8=; b=l4pyFeyuiT0Wff BqzZroHUiuWzdk676w4smrsH/TVAufVgJhiO9WMeG04ME93ZKXDwzDCk1l7W7mzrE9FvBNnSlPj+2 Pyrw7oe5Ja1qdoZqPnMKhO1Pp4CW7k/zXawVtjKhi1CIbxy0UTLvODrpjG2Hn6/qzbX4QrTQUdgB4 dJM9+DS3f+MD/zjMCJbm0I5nbDi3gyfA5oy5nP4pn2pE9OODk5cg9YAk7KHtnhVJmP82CcsPAGMiv V4GycMlqOUu2WmVVOp+PAFTo/+H87n0T4d8TIsR4gSH1eRnjWJVNoqBqNga/merDUTA2niPMORHw9 ZsPZdI2kzVwODVs72xMA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9AB3-000347-D0; Wed, 27 Mar 2019 15:09:17 +0000 Received: from smtp-out.xnet.cz ([178.217.244.18]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h9AAv-0002ye-07 for openwrt-devel@lists.openwrt.org; Wed, 27 Mar 2019 15:09:11 +0000 Received: from meh.true.cz (meh.true.cz [108.61.167.218]) (Authenticated sender: petr@true.cz) by smtp-out.xnet.cz (Postfix) with ESMTPSA id 30F245256; Wed, 27 Mar 2019 16:09:02 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 68bc4d8e; Wed, 27 Mar 2019 16:09:00 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Wed, 27 Mar 2019 16:08:55 +0100 Message-Id: <1553699336-5208-2-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553699336-5208-1-git-send-email-ynezz@true.cz> References: <1553699336-5208-1-git-send-email-ynezz@true.cz> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190327_080909_725679_6CF2E6E4 X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [178.217.244.18 listed in list.dnswl.org] Subject: [OpenWrt-Devel] [PATCH 1/2] build: Remove TARGET_IMAGES_PAD option X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Petr_=C5=A0tetiar?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org 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. 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 --- config/Config-images.in | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/config/Config-images.in b/config/Config-images.in index 6610601d..eb050ca 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -240,23 +240,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"