From patchwork Sat Sep 7 11:22:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Edgecumbe X-Patchwork-Id: 1219 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 430A3130FFFBB for ; Sat, 7 Sep 2019 11:23:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on apollo X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=DKIM_INVALID=1, DKIM_SIGNED=0.1,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001 autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 7 Sep 2019 11:23:08 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id D423315323E120; Sat, 7 Sep 2019 11:23:05 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [IPv6:2a01:4f8:160:3033::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS; Sat, 7 Sep 2019 11:23:05 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 7BCBE2C447; Sat, 7 Sep 2019 11:22:54 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=esotericnonsense.com header.i=@esotericnonsense.com header.b=t01h2yEh; dkim=fail reason="signature verification failed" (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=jH/Luk8f Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 572AF2BD7A for ; Sat, 7 Sep 2019 11:22:51 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 7 Sep 2019 11:22:51 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 1FDBE15323E0DC for ; Sat, 7 Sep 2019 11:22:50 +0000 (UTC) Received: from new2-smtp.messagingengine.com (new2-smtp.messagingengine.com [66.111.4.224]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Sat, 7 Sep 2019 11:22:49 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 3CBD420C3; Sat, 7 Sep 2019 07:22:49 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 07 Sep 2019 07:22:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= esotericnonsense.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; s=fm1; bh=rn2khZQbx8muzBE8IcM8kj761syNvOc+ASC5y3VQtBM=; b=t01h2 yEhv33KsgI1MUiJLykcShDQFeVovgvPBoDZ471rAd5zT9UhaQvISoOMNplkSj/w8 m/M+OOD+th/ZocEv3e2x9PIJxpLGILvY74UqeeKQMRfml9hfWqolXkl63crRPt5s EWjLo++aW0GumyOTdTdsFJlT3I0x1tYVq8h2ask3FrrJyn0GR+qp0YDnBi4bz2hU fv5Jo9HQAV57qzyGNRgdTgDJ9Q8nCEQzMD//26lY5ViU+1uqYKm6/7ClXgUoO59h FE/aNnFEwJTbfvflDO93H7jH/lZ3RKJxukLiIYksOc2TAgbuw25TBzNJK/o0X/Tx GraTcC09aglNZvQBw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=rn2khZQbx8muzBE8IcM8kj761syNvOc+ASC5y3VQtBM=; b=jH/Luk8f 4AzAy0xeacq1xUTj0slmmKzcGJdMU+3Rom9XZuQ0T9bD2dQ2pBXX2K45muyGECyH /18/Ts3aI+8rYNB8iJPTHWqU3nrrX/oxDr4sIJyRcs9Aw29HXr+GG0b/Wtq2pTpq N8RYUjoMUKMB0con9jLpSWu7oi1BMSAd4NVkBGjnvoYwc2/v1L8VHUcI8tpt72td FClR3GvzXXi5mtJkKrlROBUNvV4sgEAhd6Ap91Jyqtxs1oe7XXxQFv1aCQrG06ub uf/Rw6i8Hi7MYsbqLxtmSkUDtNk3RS0gvcENQcPl49I6vFftUd1HXGZf9B8MdOnu UhAN0dCopZc1Ww== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudekuddgfeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgorfhhihhshhhinhhgqdfkphfpvghtfihorhhkuc dlfedttddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhm peffrghnihgvlhcugfgughgvtghumhgsvgcuoehgihhtsegvshhothgvrhhitghnohhnsh gvnhhsvgdrtghomheqnecuffhomhgrihhnpehrvghprhhoughutghisghlvgdqsghuihhl ughsrdhorhhgnecukfhppedufeelrdduiedvrddufedurddvfeejnecurfgrrhgrmhepmh grihhlfhhrohhmpegvmhgrihhlsegvshhothgvrhhitghnohhnshgvnhhsvgdrtghomhen ucevlhhushhtvghrufhiiigvpeei X-ME-Proxy: Received: from localhost.localdomain (test.electronrelocation.com [139.162.131.237]) by mail.messagingengine.com (Postfix) with ESMTPA id 81787D6005D; Sat, 7 Sep 2019 07:22:48 -0400 (EDT) From: Daniel Edgecumbe To: arch-releng@archlinux.org Date: Sat, 7 Sep 2019 12:22:39 +0100 Message-Id: <20190907112240.1028433-7-git@esotericnonsense.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190907112240.1028433-1-git@esotericnonsense.com> References: <20190907112240.1028433-1-git@esotericnonsense.com> MIME-Version: 1.0 Subject: [arch-releng] [PATCH 6/7] [mkarchiso] Force all ISO timestamps to SOURCE_DATE_EPOCH if present X-BeenThere: arch-releng@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Arch Linux Release Engineering List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux Release Engineering Cc: Daniel Edgecumbe Errors-To: arch-releng-bounces@archlinux.org Sender: "arch-releng" xorrisofs respects SOURCE_DATE_EPOCH but only for its' own generated fields. We need to replace all other timestamps. Motivation: https://reproducible-builds.org Signed-off-by: Daniel Edgecumbe --- archiso/mkarchiso | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 383a967..59fa9c4 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -307,7 +307,12 @@ command_iso () { if [[ ${quiet} == "y" ]]; then _qflag="-quiet" fi + local _rflag="" + if [[ ${SOURCE_DATE_EPOCH:-} ]]; then + _rflag="--set_all_file_dates $(date --utc --date="@${SOURCE_DATE_EPOCH}" +%Y%m%d%H%m%S00)" + fi xorriso -as mkisofs ${_qflag} \ + ${_rflag} \ -iso-level 3 \ -full-iso9660-filenames \ -volid "${iso_label}" \