From patchwork Wed Jul 29 19:00:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1338478 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=bqH8CYhK; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BH2yC5cXjz9sRN for ; Thu, 30 Jul 2020 05:03:47 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=UFzGFFm+SG0kTRHj5WsmHcs0MlLEGWtzn5frdTHITgM=; b=bqH8CYhKkTYysp3+lkSO5jUggg gRpm2sdkZe04J46TE1zWXVJUh27+ZTgrxMdWFjsQlg9ZjYBXhcA76z/a/2s1s/AXFZVrQQGIBZ7+z QHlxjeMvdpfuW4ZDXMjhYhffZiMemQ3WT6JOQDH3BPTRU0YGvmgEY94da94h96cTeFGAXEAyU3JEm XI5k4fNFI79xzSMQQW4XV5dZsgqbuAoIHhLLIZexB+Pc3s5CTkY5T8mV/JdtA4nAf7N98e7FAVW44 32lKflqKNyV2YDCRXnYw1O46n6Ak3y36KBKRNYUJm2czvKp04E5X403HJLRwziaIr+Y717tKhSGut F6hfB1cQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rKe-0002oV-Jq; Wed, 29 Jul 2020 19:01:40 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rKY-0002nj-Mz for openwrt-devel@lists.openwrt.org; Wed, 29 Jul 2020 19:01:36 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MVvCl-1kARbF0vMj-00Rr1l for ; Wed, 29 Jul 2020 21:01:24 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/2] build: image: drop unused check-kernel-size recipe Date: Wed, 29 Jul 2020 21:00:11 +0200 Message-Id: <20200729190012.31535-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:qRiAkZRPtgGriNM4laDHdZsDj/lj95wIla/3EMVxFEMfgAF0eWy rUH42J6hydAWcPO1Wntvwv+jL0Rk2Ra/XC43Lhm0ohIOYWvQuEj9I0XHcQHtp5EGk4jcP+w BrqIKE2kO+VoK1l/rAFnfTA1zia3HTX1JdDMkcfJIaxbtPElA5G8sLL8JXRVilz1kuDLlfw /oEtD5fXk/PyzVOHPvAww== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:NIn0MqCoquA=:dYdLiXLCCbVynPlSG60AQN pSzskZxZ5GaV/vXBUWiESP51GdycKvTkT02PIAIegAs/CdaLo4QaSaXFyISpfgdHbkdAJYUWh HetR6lWMKqh+MSw9FLJ1iVOCIxaoI/OAt8BtJMEXqDoucyw5qGdSkLYFIf4cqvATRYIbUPBww iXJRdtmhtLLhWcqgxjzy/rhKHbV8HXXb166PEUf1GOi2+0cxuR9YW3zMjR6QL3/LJR26OpmNI AYRmzRZyli2T8HB7pGNl3gBOreNddSH5boZfHxZI2GhM6W6wuwc46dbxKs+wpgoO8lkkCBghx GfKCGyDabGdQurZep8I9V8SCOTt1OF5AvNDW1za90/9TBR4fjaSH0uIdEHlLdj+uQ+zKgYZVw Zqphz7qbwsreHLqf8oUu6gfcyzpOeK4TshoVP8kA/S8ufGRxmB1uJRY9+927arBVQjylWpb9o K3dOl7AMaKsOMZNmL50XpZSZfr+9To9nu2eIuwt+jDERDGXhZAzqdggLxirhdTrW5LvRlyYdI l35WdEZ+8UbRcfZYaUPNuiss5HYkO/rpvDeDv0ZEX0rvH9ee9sgrTkeUwZXhvLJ7CxtaTWmPQ 8BmFQwAm2N7nBiIt0wcJKBrP8utusKPHMaglzzmimIdrQYM5MMJd+mnns0uuwCggYkgDjK6P/ Bw+9MPjzbyNcTfqS2XcZcpPot4YOTs80QbTPxMbwva6lOXB7El9PJA+Ux7f78wXhlpg4SXaSK lSu5wMkdS0v0y/pjdBJJ/IMJKxfxhxdwSHwpssOoTNYhXv5htAgJ78fYqxCt3hIyViXtYZDil EOIYWECHjha3bv2BhsWyst8rgI/Ks9x+UCV+Ed+X4FN4MUZmwSWRCnXj7aPCg7q8kZZIn98NA SKilnX2iOi370Nmt0eVQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_150134_962865_8A8312A6 X-CRM114-Status: GOOD ( 11.22 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [217.72.192.75 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.75 listed in wl.mailspike.net] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The recipe check-kernel-size is not used in the entire tree. Instead, we already check the size of the kernel image in Device/Build/kernel in image.mk via check-size function if KERNEL_SIZE is defined. Therefore, drop the function. Using it would be redundant anyway. Signed-off-by: Adrian Schmutzler --- include/image-commands.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index e7db7128b4..97a66dce30 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -275,13 +275,6 @@ define Build/check-size } endef -define Build/check-kernel-size - @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(1))))) -ge "$$(stat -c%s $(IMAGE_KERNEL))" ] || { \ - echo "WARNING: Kernel for $@ is too big > $(1)" >&2; \ - rm -f $@; \ - } -endef - define Build/combined-image -sh $(TOPDIR)/scripts/combined-image.sh \ "$(IMAGE_KERNEL)" \ From patchwork Wed Jul 29 19:00:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1338479 X-Patchwork-Delegate: freifunk@adrianschmutzler.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=eranO1ox; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BH2yF6kjSz9sRN for ; Thu, 30 Jul 2020 05:03:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:To:From: Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f4xwMns7DnSyVN567f6HktUsdUAwM3/qnNcjBIXFbFk=; b=eranO1oxQlUMvXj/bsaVQBweQm xs0YHVEuYhG53WheFsa0R6kXWJJltzwa1nP0o+7QGFyQFWeZ12c1N3bEDOXY3+Y55i81SKCToJ2YO W0Zy4Zq589PUb6qvWLFkjvKUMzR2qOm8Wr3IwL0tX2x4KOfwls8ADSaIlsCeh9oZ3nZdtbFTz+sMT 6iLKZcUvF0qMLFjErzRqSaQVWtAOI92pY2kLeNZ6BX05tHoPkGO1dKh0sSHI7LDm6/oVMxLzmx2v6 BF7nDqGWGtm09kmat/SHsF+T/1R1h5saDVRecP3uK0VF/LqWIeO13pVXtVPQx7umlIb0b/bt5VSyZ 3Kfnqq4w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rKd-0002oN-Ha; Wed, 29 Jul 2020 19:01:39 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0rKY-0002ni-Lu for openwrt-devel@lists.openwrt.org; Wed, 29 Jul 2020 19:01:36 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MryKp-1kWOGn1eL7-00nwHx for ; Wed, 29 Jul 2020 21:01:24 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] build: image: return sizes if check-size fails Date: Wed, 29 Jul 2020 21:00:12 +0200 Message-Id: <20200729190012.31535-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200729190012.31535-1-freifunk@adrianschmutzler.de> References: <20200729190012.31535-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Hg+XhfdzIGTCvpwU90bN0RKqK68DqnVujnYRdku3aQ9wsdIziZr sXhfq5Stp/Nmc0VkU3sc7Y9bOAuuMehK9019tThvcdKzCESfaEDuOrZHu/92glsZdWWmhU3 Z4GBljeH2cIf7M/0DVkB0guKyYg4wUxyJU9Qkqw35QxUo3ZZ2v+6tAye/IImBaFpR3xKTDM Ya2VLPJ/dx4OcSAO1do/w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:3wF0+/yD+1s=:+tYG/kXoa30mxVrV9+4ZX8 UqA57uHTMDnMV4wUOZLgUSutmJ8rSzsY9EI+WC+OyM1ePAmP0WOtjNGSJUANGsNEvNPBXZHAJ pNHgKaP6mXyQn/13IbGm7k50W/HxF0WWyv8RzSqb2lo6DWp6dKkj0LrZIjPKdeJgviGtoTXbW 0+0Dbj0qeoNJlWPZg1zNWXal/GGv4odiwdSAUAsxlAAjP2ui76xvlSpMJ65xZqfrQaUI+eCM3 V2mTN+YZ0C4aJvt+tC0WKAQ1SybKxV6BMeD1+9LosbxB0RCsURyQQzeim3Pnd0Mel/WllcyDM ZxFiiB5EUAeZOq451kswMKxzkDl1DEEMDx7DK7s0fX06AAnYVICU9nRyVJ5b0Uc6/UgESqCiL X4Rb03vAO8z2if3gwHzVDybWSYMPV0wt58mP/G9bwzZ/hNKjYwrW4gsiL6cVb4WRhyA5b4fHi fzLmNruU5mzm5moF8xiQH35RPJixFThvUQJt7Ixy61H1VB1cTOwOVs+8NpVRhnpBs5iwALkKc WHzaHflaKm5kNuUy0kJUF40ecVGy2znaYNy6sdkLsW+42met+hyjhLFF+tycdpl11J03QONuz w79zt/+RX/Nvh0DP0b5ApxF3QHhvwFg+w0CXv1vearuWYsjK6Dx831L9NOB85jZSJM0Qf/eKV 6qDJVtfLRvkp6/TXg1sv4BONEPwNnLWX+WNH2vx7ac0flQTi9A8ObevtmONF47jLlno8JSorN ReV0F5rVMg8SDs5vmxIkrgMZGZaFRRWanrfKRK/HwV9aCpbGQgVKvWWNPfm5sHUNGWQ529KaI 8imxn/S/CdYGja8cCuf+U2raYKb9hYyGGT1X2XCr45JS7W1nFrlSnt1E7zMQ3VrYxC+Jz60WT zx3CEZqjJHSVnz2UYyjg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_150134_926095_461F289E X-CRM114-Status: GOOD ( 12.19 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [217.72.192.74 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.74 listed in wl.mailspike.net] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Instead of just printing a warning that an image is too big, also print both actual size and limit in the string: WARNING: Image file somename.bin is too big: 2096101 > 1048576 Since the kernel size is checked via the same function (if KERNEL_SIZE is specified), this will also apply to the kernel image size check. Signed-off-by: Adrian Schmutzler --- include/image-commands.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 97a66dce30..811edba994 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -269,8 +269,10 @@ define Build/xor-image endef define Build/check-size - @[ $$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE)))))) -ge "$$(stat -c%s $@)" ] || { \ - echo "WARNING: Image file $@ is too big" >&2; \ + @imagesize="$$(stat -c%s $@)"; \ + limitsize="$$(($(subst k,* 1024,$(subst m, * 1024k,$(if $(1),$(1),$(IMAGE_SIZE))))))"; \ + [ $$limitsize -ge $$imagesize ] || { \ + echo "WARNING: Image file $@ is too big: $$imagesize > $$limitsize" >&2; \ rm -f $@; \ } endef