From patchwork Sat Sep 7 11:22:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Edgecumbe X-Patchwork-Id: 1216 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 7480F130FFF69 for ; Sat, 7 Sep 2019 11:22:59 +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 [IPv6:2a01:4f8:160:6087::1]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 7 Sep 2019 11:22:59 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 2847615323E0F2; Sat, 7 Sep 2019 11:22:58 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (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:22:58 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id E1B302C409; Sat, 7 Sep 2019 11:22:52 +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=o0h2KPE1; dkim=fail reason="signature verification failed" (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b=X0JUjxih Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 07F912BDD0 for ; Sat, 7 Sep 2019 11:22:50 +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:50 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 64C1915323E0D1 for ; Sat, 7 Sep 2019 11:22:47 +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:47 +0000 (UTC) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.nyi.internal (Postfix) with ESMTP id 82FA51FE9; Sat, 7 Sep 2019 07:22:46 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 07 Sep 2019 07:22:46 -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=KbhkVoXPmrG5STCmmqxSC6HG3E/lz4uptzQPADUC870=; b=o0h2K PE1SVV7UlxhHLhidfGZhXjIRP4/B02A6/V3m09ZGrINM6xXwspFP9KqQe0mmW0oh E7Xe+dGf5CzOnFrbMhEcNLEyQV5JHTlOCLR8DtsWB6X74kbyAAnNjKV9G5fZKWem 58FXFjEl0eUsC79+KxMA9yCX4K8wDnONkoph+p/nhHJmGppw0liEViKDgIunR9xl x+bfpNnFROOwGAe0dDH/d3qiwXAgjavDY1XJX4H5BRKmMQP1mZ/Vtc0wLDHjUV0i Qz7i+BiOx+Np6t5q2+c18u07X88boiCqMPzabAGukLG1mLUVhca+dHPMos1EKxVA 81BN/gkQooti5YlKQ== 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=KbhkVoXPmrG5STCmmqxSC6HG3E/lz4uptzQPADUC870=; b=X0JUjxih iXKlDbW1TVPlbGsRyDMER0GjCdajqrfpq6dm3y85UWwdpQxB4DeM3AQ4PHAkOykB mWMPM6jO/n00jYpMYF5X5s2Igeo+Z2pch7VZQhhbAdIPtVW9qWcAOfYZdVLMRw/A NjUl47wSfMJwiY5ABr29+a02qLPppbbdUsd1Y7R5PfbzotfKrq/7zvbUpLrfzFR+ W542ss4h+T5vg4Q4GxGGXW3kvRNB/+G6ttUSBYsTIQ3LxtqSfwu3+tCwJw5OQK7g 9ZgJ7cFNhrF8cfftqVYyrtrbjg8wKPTjSK+2NHLJOgVfQ3Iz5DAxee69W3ipJ0Mz YoS+uyzecmKmIQ== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduvddrudekuddgfeekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgorfhhihhshhhinhhgqdfkphfpvghtfihorhhkuc dlfedttddmnecujfgurhephffvufffkffojghfggfgsedtkeertdertddtnecuhfhrohhm peffrghnihgvlhcugfgughgvtghumhgsvgcuoehgihhtsegvshhothgvrhhitghnohhnsh gvnhhsvgdrtghomheqnecuffhomhgrihhnpehrvghprhhoughutghisghlvgdqsghuihhl ughsrdhorhhgnecukfhppedufeelrdduiedvrddufedurddvfeejnecurfgrrhgrmhepmh grihhlfhhrohhmpegvmhgrihhlsegvshhothgvrhhitghnohhnshgvnhhsvgdrtghomhen ucevlhhushhtvghrufhiiigvpeeh X-ME-Proxy: Received: from localhost.localdomain (test.electronrelocation.com [139.162.131.237]) by mail.messagingengine.com (Postfix) with ESMTPA id C1EE5D60057; Sat, 7 Sep 2019 07:22:45 -0400 (EDT) From: Daniel Edgecumbe To: arch-releng@archlinux.org Date: Sat, 7 Sep 2019 12:22:35 +0100 Message-Id: <20190907112240.1028433-3-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 2/7] [releng] Retain the post-cleanup airootfs directory 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" Removing the pre-cleanup directory gives misleading results when diffing the results of two builds. Motivation: https://reproducible-builds.org Signed-off-by: Daniel Edgecumbe --- configs/releng/build.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 810e3a0..3a105df 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -1,6 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: GPL-2.0 # Copyright (C) 2005-2019 Arch Linux Release Engineering Team +# Copyright (C) 2019 Daniel Edgecumbe set -e -u @@ -217,8 +218,8 @@ make_prepare() { cp -a -l -f ${work_dir}/x86_64/airootfs ${work_dir} mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist mkarchiso ${verbose} -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare - rm -rf ${work_dir}/airootfs - # rm -rf ${work_dir}/x86_64/airootfs (if low space, this helps) + rm -rf ${work_dir}/x86_64/airootfs # pre-cleanup + # rm -rf ${work_dir}/airootfs # post-cleanup } # Build ISO