From patchwork Fri Mar 29 14:07:16 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: 1069726 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="bQzjsrSr"; 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 44W3Vg01GHz9sPW for ; Sat, 30 Mar 2019 01:08:27 +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=azPykgEinNThN4dvscwrdS+tHemiAjKyxZB9nwXGVUg=; b=bQzjsrSrcYfmPg AwF4MG/BPEJhjuEO6GhmRbDHp1BjXwoOStF8V60B00usDGiphvZ1VLCMd6blSMVciLodoD/s5zC6n Wa76xEWMbSZgCblw6zJUrMZ0PwzoZEWMwAcwNhhB+M/axSFmymxV7c7mvNYR+oIOlyFfbI7MK+L+m roTas3TAZJo8W/iO2cBR+Z7K1FgeYJicyuNDdswr3tfxdUjWmYQ/r9qK/MU0F4fEsCaxMNm7Sarak JvRWrqhcm1fqiO4w3EYJkTbU7J4Hk5ev9VJvb4pp6xcDbe3eO3XL6uSEbRDcrg5LSZB9WxM+SCTYu hykpeptBtdfItzsjoCRQ==; 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 1h9sB2-0003Yy-BA; Fri, 29 Mar 2019 14:08:12 +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 1h9sAO-0002g9-1X for openwrt-devel@lists.openwrt.org; Fri, 29 Mar 2019 14:07:36 +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 C522741D5; Fri, 29 Mar 2019 15:07:26 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id d2f3aa7e; Fri, 29 Mar 2019 15:07:25 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Mar 2019 15:07:16 +0100 Message-Id: <1553868440-26476-2-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553868440-26476-1-git-send-email-ynezz@true.cz> References: <1553868440-26476-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-20190329_070732_641461_9C8F7CC4 X-CRM114-Status: UNSURE ( 6.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/5] build: image: Add IMG_ROOTFS and IMG_COMBINED variables 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 Adding those two variables in order to share them across the tree. Signed-off-by: Petr Štetiar --- include/image.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/image.mk b/include/image.mk index 9e40a54..6d9e347 100644 --- a/include/image.mk +++ b/include/image.mk @@ -42,6 +42,8 @@ IMG_PREFIX_VERNUM:=$(if $(CONFIG_VERSION_FILENAMES),$(call sanitize,$(VERSION_NU IMG_PREFIX_VERCODE:=$(if $(CONFIG_VERSION_CODE_FILENAMES),$(call sanitize,$(VERSION_CODE))-) IMG_PREFIX:=$(VERSION_DIST_SANITIZED)-$(IMG_PREFIX_VERNUM)$(IMG_PREFIX_VERCODE)$(IMG_PREFIX_EXTRA)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET)) +IMG_ROOTFS:=$(IMG_PREFIX)-rootfs +IMG_COMBINED:=$(IMG_PREFIX)-combined MKFS_DEVTABLE_OPT := -D $(INCLUDE_DIR)/device_table.txt From patchwork Fri Mar 29 14:07:17 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: 1069725 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="n5U4+bY3"; 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 44W3VL27t8z9sQs for ; Sat, 30 Mar 2019 01:08:10 +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=RFloKw7YxlPKLvAB+wsgrbM7bfGl/oFppnkWCOkncLk=; b=n5U4+bY3LdZFJV aESyJeeQH1yjjyNQZsllMUSPMoU+Kzqb0X9FBVmn9Il7p82m50kjVHTWWzQFspnHtH1j6rQ2NKfeD +k/lPSrMwflnfO2+CVSnGQZZu12o056PebvDBR98rGDDJ6GX9gdXn0rAJQdYuPNMup6MU5NNdJibc FCoX6i1nsW44UZCcFPOAMPRVcTzJt9IaaJFW9Hg0L7Lzzl9WCVBzKNMA8TZq/ABw7BkNY3G1rLUyo zCCvf1Z4tViE+IZJQN49/vItHosoITuRVQ5yfI8EQgl4SkP+6M2uQGJGYj8MLJKMC0l+T1g62ywgA yf9gWgnvFTZtai6+DmEA==; 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 1h9sAq-0003JX-QI; Fri, 29 Mar 2019 14:08:00 +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 1h9sAO-0002gA-1O for openwrt-devel@lists.openwrt.org; Fri, 29 Mar 2019 14:07:36 +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 E4ADB41DB; Fri, 29 Mar 2019 15:07:26 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id c38a0ee0; Fri, 29 Mar 2019 15:07:25 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Mar 2019 15:07:17 +0100 Message-Id: <1553868440-26476-3-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553868440-26476-1-git-send-email-ynezz@true.cz> References: <1553868440-26476-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-20190329_070732_636666_908E4F0E X-CRM114-Status: UNSURE ( 7.40 ) 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 2/5] build: image: Add pad-to and pad-rootfs-squashfs helpers 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 In order to share common functionality across platforms. Signed-off-by: Petr Štetiar --- include/image-commands.mk | 3 +-- include/image.mk | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 8251a81..06c084c 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -230,8 +230,7 @@ define Build/append-uboot endef define Build/pad-to - dd if=$@ of=$@.new bs=$(1) conv=sync - mv $@.new $@ + $(call Image/pad-to,$@,$(1)) endef define Build/pad-extra diff --git a/include/image.mk b/include/image.mk index 6d9e347..8b84c8c 100644 --- a/include/image.mk +++ b/include/image.mk @@ -180,6 +180,15 @@ ifeq ($(strip $(call kernel_patchver_ge,4.17.0)),1) -Wno-unique_unit_address endif +define Image/pad-to + dd if=$(1) of=$(1).new bs=$(2) conv=sync + mv $(1).new $(1) +endef + +define Image/pad-root-squashfs + $(call Image/pad-to,$(KDIR)/root.squashfs,$(if $(1),$(1),$(CONFIG_TARGET_ROOTFS_PARTSIZE)M)) +endef + # $(1) source dts file # $(2) target dtb file # $(3) extra CPP flags From patchwork Fri Mar 29 14:07:18 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: 1069723 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="fCMW5X9D"; 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 44W3VG4C89z9sQm for ; Sat, 30 Mar 2019 01:08:06 +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=lyd67yaPtXwE38o6+dmii3UmKK9fHzn/tyK6E1sQpW0=; b=fCMW5X9DZdGbWB wa1sUfEw+Zj3xVftjaXpi7h9mcGBxI2fjEA92MgrRxuIzRBkL7hbOPd1o+ttrID0lq0CVhPiSChWj gnlvs0C7Xi06C72vRR/fKX2zEQxNv1wjPSkegKJHhLD1zKW2mwVYHnvBijh6HqCOEqNMBT15k/Zvx EliRRKwrbPgWPKmJLRHTnigKr2uVRtWuU4Cv52GEPa1FkecS1bJ5HHIn4YNjDR79mYLTfHkODyg6Z HDE4vSTprEOQYkTpoNiduo/snuRg0US2Bpl0oIPVGBdmDB8XFKQABnYbM4laakUrQYZBnSQNFNHBZ Nh5bxE5F49yuurgdhGBQ==; 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 1h9sAU-0002nJ-Vp; Fri, 29 Mar 2019 14:07:39 +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 1h9sAO-0002gD-0j for openwrt-devel@lists.openwrt.org; Fri, 29 Mar 2019 14:07:34 +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 10CCE41DE; Fri, 29 Mar 2019 15:07:28 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id d95cee8c; Fri, 29 Mar 2019 15:07:26 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Mar 2019 15:07:18 +0100 Message-Id: <1553868440-26476-4-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553868440-26476-1-git-send-email-ynezz@true.cz> References: <1553868440-26476-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-20190329_070732_618436_660B4F0A X-CRM114-Status: UNSURE ( 6.62 ) 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 3/5] build: image: Add variable for gzip-ext4-padded-squashfs 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 This common code could be shared by at least 3 targets (malta, armvirt and x86) so let's factor it out to separate variable. Signed-off-by: Petr Štetiar --- include/image.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/image.mk b/include/image.mk index 8b84c8c..7eb7f23 100644 --- a/include/image.mk +++ b/include/image.mk @@ -300,6 +300,27 @@ define Image/Manifest $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest endef +define Image/gzip-ext4-padded-squashfs + + define Image/Build/squashfs + $(call Image/pad-root-squashfs) + endef + + 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 + +endef + ifdef CONFIG_TARGET_ROOTFS_TARGZ define Image/Build/targz $(TAR) -cp --numeric-owner --owner=0 --group=0 --sort=name \ From patchwork Fri Mar 29 14:07:19 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: 1069728 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="gm/fXEbN"; 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 44W3Vn00v6z9sQm for ; Sat, 30 Mar 2019 01:08:32 +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=mpj/+m4FWql+jhEn1r6tUh/O/GDQLInqz1bCI+aIb9I=; b=gm/fXEbNifTU2o LS7jJlhnKK7MoKVOnaZehsgZdMSOueuB4lPR4wamcsvRHpH8GgWZBxB3GwUutjPl+QnFd0HWIZ4Kl ljvfTz/VN/PXYhmevgPepAmsbKI+fnIh0ZRMjGRtdEHpwSQBOgEwgKkbWvUlchJ9W5zdOJ1GV+8al GAEHaLxO5PFQdimdMe79n0ryT+c1p16w5aIyUtIxKd7ZUMXGDh/zQM/6XvqmeCXmSOVHwURpQGqUM RAlvWgoudzIVa++TL2dDHIV7SoJn4km8F6OJF67ttdcRmc6OAZlUbrJG7HnRjiZbb10vK7KMCOd6e aJjIXufkFNgGPtv/081Q==; 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 1h9sBD-0003oN-Iy; Fri, 29 Mar 2019 14:08:23 +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 1h9sAO-0002gE-1Q for openwrt-devel@lists.openwrt.org; Fri, 29 Mar 2019 14:07:37 +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 307F441E5; Fri, 29 Mar 2019 15:07:28 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 4ca653f3; Fri, 29 Mar 2019 15:07:26 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Mar 2019 15:07:19 +0100 Message-Id: <1553868440-26476-5-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553868440-26476-1-git-send-email-ynezz@true.cz> References: <1553868440-26476-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-20190329_070732_641573_8F467DFC X-CRM114-Status: UNSURE ( 8.37 ) 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 4/5] rb532, x86: image: Use new IMG_COMBINED and IMG_ROOTFS vars 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 In `build: image: Add IMG_ROOTFS and IMG_COMBINED variables` we've added this new variables so switch to them now. Signed-off-by: Petr Štetiar --- target/linux/rb532/image/Makefile | 2 +- target/linux/x86/image/Makefile | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/target/linux/rb532/image/Makefile b/target/linux/rb532/image/Makefile index 12265fe..615c9bd 100644 --- a/target/linux/rb532/image/Makefile +++ b/target/linux/rb532/image/Makefile @@ -84,7 +84,7 @@ define Image/Build $(call Image/Build/$(1),$(1)) $(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel $(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel 'root=/dev/sda2 ' - ./gen_image.sh $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).bin \ + ./gen_image.sh $(BIN_DIR)/$(IMG_COMBINED)-$(1).bin \ 6 $(BIN_DIR)/$(IMG_PREFIX)-$(1).kernel \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ 128 diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 2d04d12..0771547 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -71,7 +71,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) -c ./grub-early.cfg \ $(GRUB2_MODULES) $(CP) $(STAGING_DIR_HOST)/lib/grub/i386-pc/*.img $(KDIR)/grub2/ - echo '(hd0) $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img' > $(KDIR)/grub2/device.map + echo '(hd0) $(BIN_DIR)/$(IMG_COMBINED)-$(1).img' > $(KDIR)/grub2/device.map sed \ -e 's#@SERIAL_CONFIG@#$(strip $(GRUB_SERIAL_CONFIG))#g' \ -e 's#@TERMINAL_CONFIG@#$(strip $(GRUB_TERMINAL_CONFIG))#g' \ @@ -81,7 +81,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ PADDING="1" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ + $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(KDIR)/root.$(1) \ 256 @@ -89,7 +89,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) --device-map="$(KDIR)/grub2/device.map" \ -d "$(KDIR)/grub2" \ -r "hd0,msdos1" \ - "$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img" + "$(BIN_DIR)/$(IMG_COMBINED)-$(1).img" endef endif @@ -125,25 +125,25 @@ endef ifneq ($(CONFIG_VDI_IMAGES),) define Image/Build/vdi - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true + rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi || true qemu-img convert -f raw -O vdi \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi + $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ + $(BIN_DIR)/$(IMG_COMBINED)-$(1).vdi endef endif ifneq ($(CONFIG_VMDK_IMAGES),) define Image/Build/vmdk - rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true + rm $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk || true qemu-img convert -f raw -O vmdk \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ - $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk + $(BIN_DIR)/$(IMG_COMBINED)-$(1).img \ + $(BIN_DIR)/$(IMG_COMBINED)-$(1).vmdk endef endif define Image/Build/gzip - gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img - gzip -f9n $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img + gzip -f9n $(BIN_DIR)/$(IMG_COMBINED)-$(1).img + gzip -f9n $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img endef ifneq ($(CONFIG_TARGET_IMAGES_GZIP),) @@ -173,7 +173,7 @@ define Image/Build $(call Image/Build/grub2,$(1)) $(call Image/Build/vdi,$(1)) $(call Image/Build/vmdk,$(1)) - $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img + $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_ROOTFS)-$(1).img else $(CP) $(KDIR)/root.iso $(BIN_DIR)/$(IMG_PREFIX).iso endif From patchwork Fri Mar 29 14:07:20 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: 1069729 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="edQMK3is"; 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 44W3W23xTyz9sQr for ; Sat, 30 Mar 2019 01:08:46 +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=uJa/DqRbKo5mVazfTvra0B7Jn5b4gdAPmvejeY29Zyg=; b=edQMK3is7cxxwN MDEU9998m33a3C+5pDv0Vwk+wpmFiJaLCOqyERXmxVBVr3W1jo23a4a9xnbRJABLsPP++eeQRqIhS CiBu/I6mpb6vcy+msTe8YNHWDgicbLNShgECmmyV235iqd3gONbz58BzsgQOy70GjKHvdSBDxNcsC 1OR+S7JjikaJZBxMNt/uyjFrJaAy5EmQ3knVCyMWvZDT6ui2z8Nms2Khnozib5Ni8G/m95BtJBkhW rplMZbqVY2tkaMOmKNxYP/KuJt62NVRoLIeaLo5pusNUbXh4mOTIOGSdKJHZGAhZKP5Yz12jFFoot S5ai2You78UzUj5zSLUA==; 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 1h9sBO-00043f-8X; Fri, 29 Mar 2019 14:08:34 +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 1h9sAR-0002iE-GH for openwrt-devel@lists.openwrt.org; Fri, 29 Mar 2019 14:07:38 +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 69AB741E8; Fri, 29 Mar 2019 15:07:28 +0100 (CET) Received: by meh.true.cz (OpenSMTPD) with ESMTP id 09e967b4; Fri, 29 Mar 2019 15:07:26 +0100 (CET) From: =?utf-8?q?Petr_=C5=A0tetiar?= To: openwrt-devel@lists.openwrt.org Date: Fri, 29 Mar 2019 15:07:20 +0100 Message-Id: <1553868440-26476-6-git-send-email-ynezz@true.cz> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1553868440-26476-1-git-send-email-ynezz@true.cz> References: <1553868440-26476-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-20190329_070735_922058_3690ACF2 X-CRM114-Status: UNSURE ( 6.90 ) 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 5/5] x86: image: Fix small disk space in squashfs overlay 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 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 --- 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