phase1: build local tar before running downloads
authorJo-Philipp Wich <jo@mein.io>
Fri, 4 Nov 2016 16:54:04 +0000 (17:54 +0100)
committerJo-Philipp Wich <jo@mein.io>
Fri, 4 Nov 2016 16:54:04 +0000 (17:54 +0100)
The download make target requires a modern GNU tar with --sort support in order
to pack SCM archives.

As Debian still ships an older tar, explicitely build the local tools/tar
before invoking "make download".

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
phase1/master.cfg

index 4014c20046d478ec8709ca24514abbf3d40c48dc..7e74bd39f7a0c438ff1d8b5bed547e67a1d99065 100644 (file)
@@ -355,6 +355,14 @@ EOT''' %(ts[0], ts[0], ts[1]) ))
                want_stdout = False
        ))
 
+       # prepare tar
+       factory.addStep(ShellCommand(
+               name = "dltar",
+               description = "Building GNU tar",
+               command = ["make", WithProperties("-j%(nproc:~4)s"), "tools/tar/install", "V=s"],
+               haltOnFailure = True
+       ))
+
        # populate dl
        factory.addStep(ShellCommand(
                name = "dlrun",