Added tar file format control support.

Author: adamshapiro0

pkg/private/tar/build_tar.py

@@ -43,7 +43,8 @@ class DebError(Exception):
     pass
 
   def __init__(self, output, directory, compression, compressor, create_parents,
-               allow_dups_from_deps, default_mtime, compression_level):
+               allow_dups_from_deps, default_mtime, compression_level,
+               tar_format=None):
     # Directory prefix on all output paths
     d = directory.strip('/')
     self.directory = (d + '/') if d else None
@@ -54,6 +55,7 @@ def __init__(self, output, directory, compression, compressor, create_parents,
     self.create_parents = create_parents
     self.allow_dups_from_deps = allow_dups_from_deps
     self.compression_level = compression_level
+    self.tar_format = tar_format
 
   def __enter__(self):
     self.tarfile = tar_writer.TarFileWriter(
@@ -63,7 +65,8 @@ def __enter__(self):
         self.create_parents,
         self.allow_dups_from_deps,
         default_mtime=self.default_mtime,
-        compression_level=self.compression_level)
+        compression_level=self.compression_level,
+        format=self.tar_format)
     return self
 
   def __exit__(self, t, v, traceback):
@@ -375,7 +378,9 @@ def main():
   compression.add_argument('--compressor',
                            help='Compressor program and arguments, '
                                 'e.g. `pigz -p 4`')
-
+  parser.add_argument(
+    '--format', default='DEFAULT', choices=('DEFAULT', 'USTAR', 'GNU', 'PAX'),
+    help='Specify the tar format to use: USTAR, GNU, PAX (default)')
   parser.add_argument(
       '--modes', action='append',
       help='Specific mode to apply to specific file (from the file argument),'
@@ -449,6 +454,15 @@ def main():
         f = f[1:]
       ids_map[f] = (int(user), int(group))
 
+  if options.format == 'DEFAULT':
+    tar_format =  tarfile.DEFAULT_FORMAT
+  elif options.format == 'USTAR':
+    tar_format =  tarfile.USTAR_FORMAT
+  elif options.format == 'GNU':
+    tar_format =  tarfile.GNU_FORMAT
+  elif options.format == 'PAX':
+    tar_format =  tarfile.PAX_FORMAT
+
   default_mtime = options.mtime
   if options.stamp_from:
     default_mtime = build_info.get_timestamp(options.stamp_from)
@@ -466,7 +480,8 @@ def main():
       default_mtime=default_mtime,
       create_parents=options.create_parents,
       allow_dups_from_deps=options.allow_dups_from_deps,
-      compression_level = compression_level) as output:
+      compression_level = compression_level,
+      tar_format=tar_format) as output:
 
     def file_attributes(filename):
       if filename.startswith('/'):

pkg/private/tar/tar.bzl

@@ -63,6 +63,7 @@ def _pkg_tar_impl(ctx):
     args.add("--output", output_file.path)
     args.add("--owner", ctx.attr.owner)
     args.add("--owner_name", ctx.attr.ownername)
+    args.add("--format", ctx.attr.format)
     if ctx.attr.mode != "":
         args.add("--mode", ctx.attr.mode)
     # Package dir can be specified by a file or inlined.
@@ -246,6 +247,7 @@ pkg_tar_impl = rule(
             doc = """Obsolete. Do not use.""",
             allow_files = True,
         ),
+        "format": attr.string(default = "DEFAULT"),
         "mode": attr.string(),
         "modes": attr.string_dict(),
         "mtime": attr.int(default = _DEFAULT_MTIME),

pkg/private/tar/tar_writer.py

@@ -49,6 +49,7 @@ def __init__(self,
                create_parents=False,
                allow_dups_from_deps=True,
                default_mtime=None,
+               format=None,
                preserve_tar_mtimes=True,
                compression_level=-1):
     """TarFileWriter wraps tarfile.open().
@@ -70,6 +71,9 @@ def __init__(self,
     else:
       self.default_mtime = int(default_mtime)
 
+    if format is None:
+      format = tarfile.DEFAULT_FORMAT
+
     self.fileobj = None
     self.compressor_cmd = (compressor or '').strip()
     if self.compressor_cmd:
@@ -102,7 +106,7 @@ def __init__(self,
     self.name = name
 
     self.tar = tarfile.open(name=name, mode=mode, fileobj=self.fileobj,
-                            format=tarfile.GNU_FORMAT)
+                            format=format)
     self.members = set()
     self.directories = set()
     # Preseed the added directory list with things we should not add. If we