[2/7,releng] Retain the post-cleanup airootfs directory

Message ID 20190907112240.1028433-3-git@esotericnonsense.com
State New
Headers show
Series
  • Making archiso deterministic
Related show

Commit Message

Daniel Edgecumbe Sept. 7, 2019, 11:22 a.m. UTC
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 <git@esotericnonsense.com>
---
 configs/releng/build.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

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 <email@esotericnonsense.com>
 
 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