make reproducible archives only of git repos without .git dir and reset timestamps with touch

Author: lexming

easybuild/tools/filetools.py

@@ -2540,12 +2540,12 @@ def copy(paths, target_path, force_in_dry_run=False, **kwargs):
             raise EasyBuildError("Specified path to copy is not an existing file or directory: %s", path)
 
 
-def get_source_tarball_from_git(filename, targetdir, git_config):
+def get_source_tarball_from_git(filename, target_dir, git_config):
     """
     Downloads a git repository, at a specific tag or commit, recursively or not, and make an archive with it
 
     :param filename: name of the archive to save the code to (must be .tar.gz)
-    :param targetdir: target directory where to save the archive to
+    :param target_dir: target directory where to save the archive to
     :param git_config: dictionary containing url, repo_name, recursive, and one of tag or commit
     """
     # sanity check on git_config value being passed
@@ -2584,8 +2584,7 @@ def get_source_tarball_from_git(filename, targetdir, git_config):
         raise EasyBuildError("git_config currently only supports filename ending in .tar.gz")
 
     # prepare target directory and clone repository
-    mkdir(targetdir, parents=True)
-    targetpath = os.path.join(targetdir, filename)
+    mkdir(target_dir, parents=True)
 
     # compose 'git clone' command, and run it
     if extra_config_params:
@@ -2668,21 +2667,36 @@ def get_source_tarball_from_git(filename, targetdir, git_config):
             for cmd in cmds:
                 run_shell_cmd(cmd, work_dir=work_dir, hidden=True, verbose_dry_run=True)
 
-    # When CentOS 7 is phased out and tar>1.28 is everywhere, replace find-sort-pipe with tar-flag
-    # '--sort=name' and place LC_ALL in front of tar. Also remove flags --null, --no-recursion, and
-    # --files-from - from the flags to tar. See https://reproducible-builds.org/docs/archives/
-    tar_cmd = ['find', repo_name, '-print0', '-path \'*/.git\' -prune' if not keep_git_dir else '', '|',
-               'LC_ALL=C', 'sort', '--zero-terminated', '|',
-               'GZIP=--no-name', 'tar', '--create', '--file', targetpath, '--no-recursion',
-               '--gzip', '--mtime="1970-01-01 00:00Z"', '--owner=0', '--group=0',
-               '--numeric-owner', '--format=gnu', '--null',
-               '--no-recursion', '--files-from -']
+    # Create archive
+    archive_path = os.path.join(target_dir, filename)
+
+    if keep_git_dir:
+        # create archive of git repo including .git directory
+        tar_cmd = ['tar', 'cfvz', archive_path, repo_name]
+    else:
+        # create reproducible archive
+        # see https://reproducible-builds.org/docs/archives/
+        # TODO: when CentOS 7 is phased out and tar>1.28 is everywhere, replace sort step
+        # in the pipe with tar-flag '--sort=name' and place LC_ALL in front of tar. 
+        tar_cmd = [
+            # print names of all files and folders excluding .git directory
+            'find', repo_name, '-name ".git"', '-prune', '-o', '-print0',
+            # reset access and modification timestamps
+            '-exec', 'touch', '-t 197001010100', '{}', '\;', '|',
+            # sort file list
+            'LC_ALL=C', 'sort', '--zero-terminated', '|',
+            # create tarball in GNU format with ownership reset
+            'tar', '--create', '--no-recursion', '--owner=0', '--group=0', '--numeric-owner', '--format=gnu',
+            '--null', '--files-from', '-', '|',
+            # compress tarball with gzip without original file name and timestamp
+            'gzip', '--no-name', '>', archive_path
+        ]
     run_shell_cmd(' '.join(tar_cmd), work_dir=tmpdir, hidden=True, verbose_dry_run=True)
 
     # cleanup (repo_name dir does not exist in dry run mode)
     remove(tmpdir)
 
-    return targetpath
+    return archive_path
 
 
 def move_file(path, target_path, force_in_dry_run=False):