From patchwork Wed Aug 17 21:41:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Lippers-Hollmann X-Patchwork-Id: 660274 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sF2mz4qzgz9t1T for ; Thu, 18 Aug 2016 07:44:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1ba8b1-0002PL-RC; Wed, 17 Aug 2016 21:41:59 +0000 Received: from mout.gmx.net ([212.227.15.15]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1ba8ax-0002MI-CG for lede-dev@lists.infradead.org; Wed, 17 Aug 2016 21:41:56 +0000 Received: from mir ([79.203.31.206]) by mail.gmx.com (mrgmx003) with ESMTPSA (Nemesis) id 0LhOvA-1ancZE3iL2-00mZUu; Wed, 17 Aug 2016 23:41:28 +0200 Date: Wed, 17 Aug 2016 23:41:28 +0200 From: Stefan Lippers-Hollmann To: Jo-Philipp Wich Message-ID: <20160817234128.14b92e77@mir> X-Mailer: Claws Mail 3.14.0 (GTK+ 2.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-Provags-ID: V03:K0:Xs/c/sdt+AQbAHGBv6kQv0krBl9AQ+rLmK3sz9zgewNzuSAQ9AK EhsMxPx4SdvJfEbdfNezoQFKiifBfvm0yNWir3YBVzB/OVCyl3n9ezJwkHMx7NDA1HAYVcb JgLSzAeSN60GO4Pku/HNdghBg3fOeyebczHn5QbaWyeN5Q39uRxXz6WwWmDO30xxp2b5J1Z YEkvtxAJg11tN3YBqsd3A== X-UI-Out-Filterresults: notjunk:1; V01:K0:8A1yzFRZiK8=:cFY1ubsC5qx5FOv7S/vrt+ 4s/Vylk7MzC04tNkYSpvjrlM7aJ+jmfXgHqSJRhFoLq2Be9wLR8fyl7iJZmriJGpIjXY4P3uF LHIWwNZS0EF8hLCr2HXKd5F2m6usnProCQ/pY/2ZmWykEewS50lanpSO3/RWrX7LwS/pO9nB9 4/nZUYtLeldNB8GJe+ixONhXgcQezhIJM7/ZtzYcILiez+rrevlAFYo/31PqGEB23dOxO+9Uk Nfnrv/HohxQHy3M6JtAvpCdhXQVKCKpIpkMc2cll+xEyXw18Kufw71AvpLtrkcvABWDbPmQ/H +pl9nonMvLyYzm9l9QGRuWKCZM8x3SfcR+55vLQOXU+e/4IwdvNyVo8EbuaalBhiT7M6KAvJ3 KrBtZhxBFagES2yaGn8jmrIjhxZslKdIJn7S2XZOGaEAXC+RGn+DOCWHtnRx2VYUifsLw6Bgo 16IRewsCbFPIJ/hlzA5fkP41+OTPq/89O7T4Z/S//Fj4wbsVWOwbO1Lo+F7K6HHQg1FXQKJ13 MuVCDM2+ywbUGw77WE9L+TKjDbPlHo9zqNhRHEhM14M/ksagxyWv+Nk4nl8hUfYoCpR1mcpmR tv6dLzpPQppGKS26vU1yq+hwzwSYX7U3vq62PESeRLWqY6hIODkFcmKSH1Ac8v31USf/590MD WcZKDYMWFvJL7exiJqXzd6z/vKnXvLmbJsdgaR0hxRBO8oFUMIomfww2IIy33uOtYjcMWveuf g7wAh9DiVsdurBAZx5gPZKfBDnzDcZtuHLNZaSh/cxxS3ew3UQrsw7FESqbzCNkLWQEMKPE6J wZEmo4e X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160817_144155_808017_871EA285 X-CRM114-Status: UNSURE ( 8.07 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [212.227.15.15 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.15.15 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (s.l-h[at]gmx.de) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Subject: [LEDE-DEV] [PATCH] build: reintroduce md5 checksums for generated firmware images X-BeenThere: lede-dev@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lede-dev@lists.infradead.org Sender: "Lede-dev" Errors-To: lede-dev-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Commit 83175687c81bee594885d0738cfd488673f5a3fb "build: remove image specific checksum code" dropped the generation of md5 checksums in favour of only shipping sha256 ones. A default Lede installation however doesn't enable busybox' sha256sum applet, which makes confirming the checksum on the device itself (e.g. for transmission errors to the device) more difficult than necessary, this patch reintroduces the generation of MD5 checksums for all firmware images. Signed-off-by: Stefan Lippers-Hollmann --- It would be simpler to call md5sum rather than openssl to generate the MD5 checksums, but in order to keep the prereqs small, I re-used openssl for this task as well, given that it's needed for the SHA256 checksums already. Makefile | 1 + rules.mk | 7 +++++++ target/imagebuilder/files/Makefile | 1 + 3 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 59320d4..51a2e38 100644 --- a/Makefile +++ b/Makefile @@ -84,6 +84,7 @@ prereq: $(target/stamp-prereq) tmp/.prereq_packages fi checksum: FORCE + $(call md5sums,$(BIN_DIR)) $(call sha256sums,$(BIN_DIR)) prepare: .config $(tools/stamp-install) $(toolchain/stamp-install) diff --git a/rules.mk b/rules.mk index de24778..92f7f52 100644 --- a/rules.mk +++ b/rules.mk @@ -371,6 +371,13 @@ define file_copy $(CP) $(1) $(2) endef +# Calculate md5sum of any plain file within a given directory +# $(1) => Input directory +define md5sums + (cd $(1); find . -maxdepth 1 -type f -not -name 'md5sums' -printf "%P\n" | sort | \ + xargs openssl dgst -md5 | sed -ne 's!^MD5(\(.*\))= \(.*\)$$!\2 *\1!p' > md5sums) +endef + # Calculate sha256sum of any plain file within a given directory # $(1) => Input directory define sha256sums diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 493012f..15c34ed 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -174,6 +174,7 @@ build_image: FORCE checksum: FORCE @echo @echo Calculating checksums... + @$(call md5sums,$(BIN_DIR)) @$(call sha256sums,$(BIN_DIR)) clean: