From patchwork Thu Aug 27 09:04:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1352409 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=none (p=none dis=none) header.from=aparcar.org 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=t+NYOwcy; 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 4BccL63WpVz9sRK for ; Thu, 27 Aug 2020 19:06:53 +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:Cc: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:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=whAvRyLi2bXfnZzOCtdjK+LyUdNYtmVtLD2G2Vx+83o=; b=t+NYOwcyeyPk89CyhtNJYDt2s VJSuA0Zx20ESySyQVh7r28tJ/ZHTdp/fHYJzvORltBOvtDFyjBwllUNWWoxOyFmhFV8O5VBuGbNmW VmrslVzYduEvx2GbLNPb0udlK8c9NANCic2thedNwqmLBXyRTJ+ji6+Af8dmB5jLcFBqdEilCOfbi CS+5qD3fuqVrvLGa+2sPmpeyjeFY4Q9lTJH62/zn0ljPzV68pZIHNJEYAoMhC/QQvZn8Z6mGWlscz +7mADuRzrtWfRhuBMPhGPESkmDNlQoRPCDEp6mEMbZRcZd7VGviF4J16sW9sbylAkIRe0C844COyV LbHGi1QkQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBDq8-0002yL-Jn; Thu, 27 Aug 2020 09:05:00 +0000 Received: from relay7-d.mail.gandi.net ([217.70.183.200]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kBDq5-0002xB-1R for openwrt-devel@lists.openwrt.org; Thu, 27 Aug 2020 09:04:58 +0000 X-Originating-IP: 72.234.141.215 Received: from dawn.lan (udp224251uds.hawaiiantel.net [72.234.141.215]) (Authenticated sender: mail@aparcar.org) by relay7-d.mail.gandi.net (Postfix) with ESMTPA id 0F00620012; Thu, 27 Aug 2020 09:04:53 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/2] imagebuilder: improve reproducibility Date: Wed, 26 Aug 2020 23:04:42 -1000 Message-Id: <20200827090442.251759-2-mail@aparcar.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200827090442.251759-1-mail@aparcar.org> References: <20200827090442.251759-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200827_050457_191949_22AFD5AF X-CRM114-Status: GOOD ( 10.68 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.200 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 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: , Cc: Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The SOURCE_DATE_EPOCH is used to unify the mtime within created images, make it the same as the build system used during creation of the IB. The LINUX_VERMAGIC is used to create a reproducible IMG_PART_SIGNATURE, therefore make it available to the IB as well. Signed-off-by: Paul Spooren --- target/imagebuilder/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 873e1b44e0..175c30282e 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -77,6 +77,8 @@ endif $(CP) -L $(LINUX_DIR)/arch/$(LINUX_KARCH)/boot/dts/* $(IB_DTSDIR); \ fi $(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(IB_BUILD_DIR)/include/version.mk + $(SED) 's,^# SOURCE_DATE_EPOCH:=.*,SOURCE_DATE_EPOCH:=$(SOURCE_DATE_EPOCH),g' $(IB_BUILD_DIR)/include/version.mk + $(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(IB_BUILD_DIR)/include/kernel.mk find $(IB_BUILD_DIR) -name CVS -o -name .git -o -name .svn \ | $(XARGS) rm -rf $(INSTALL_DIR) $(IB_IDIR)