v0 of our multi-rpm generator

Author: kellyma2

pkg/make_rpm.py

@@ -82,10 +82,9 @@ def Cleanup():
 
 def FindOutputFile(log):
   """Find the written file from the log information."""
-
-  m = WROTE_FILE_RE.search(log)
+  m = WROTE_FILE_RE.findall(log)
   if m:
-    return m.group('rpm_path')
+    return m
   return None
 
 def SlurpFile(input_path):
@@ -188,7 +187,7 @@ def __init__(self, name, version, release, arch, rpmbuild_path,
     self.arch = arch
     self.files = []
     self.rpmbuild_path = FindRpmbuild(rpmbuild_path)
-    self.rpm_path = None
+    self.rpm_paths = None
     self.source_date_epoch = helpers.GetFlagValue(source_date_epoch)
     self.debug = debug
 
@@ -205,6 +204,7 @@ def __init__(self, name, version, release, arch, rpmbuild_path,
     self.post_scriptlet = None
     self.preun_scriptlet = None
     self.postun_scriptlet = None
+    self.subpackages = None
 
   def AddFiles(self, paths, root=''):
     """Add a set of files to the current RPM.
@@ -228,6 +228,7 @@ def SetupWorkdir(self,
                    preamble_file=None,
                    description_file=None,
                    install_script_file=None,
+                   subpackages_file=None,
                    pre_scriptlet_path=None,
                    post_scriptlet_path=None,
                    preun_scriptlet_path=None,
@@ -269,6 +270,8 @@ def SetupWorkdir(self,
       SlurpFile(os.path.join(original_dir, preun_scriptlet_path)) if preun_scriptlet_path is not None else ''
     self.postun_scriptlet = \
       SlurpFile(os.path.join(original_dir, postun_scriptlet_path)) if postun_scriptlet_path is not None else ''
+    self.subpackages = \
+      SlurpFile(os.path.join(original_dir, subpackages_file)) if subpackages_file is not None else ''
 
     # Then prepare for textual substitution.  This is typically only the case for the
     # experimental `pkg_rpm`.
@@ -277,6 +280,7 @@ def SetupWorkdir(self,
       'POST_SCRIPTLET': ("%post\n" + self.post_scriptlet) if self.post_scriptlet else "",
       'PREUN_SCRIPTLET': ("%preun\n" + self.preun_scriptlet) if self.preun_scriptlet else "",
       'POSTUN_SCRIPTLET': ("%postun\n" + self.postun_scriptlet) if self.postun_scriptlet else "",
+      'SUBPACKAGES' : (self.subpackages if self.subpackages else ""),
       'CHANGELOG': ""
     }
 
@@ -406,9 +410,9 @@ def CallRpmBuild(self, dirname, rpmbuild_args):
 
     if p.returncode == 0:
       # Find the created file.
-      self.rpm_path = FindOutputFile(output)
+      self.rpm_paths = FindOutputFile(output)
 
-    if p.returncode != 0 or not self.rpm_path:
+    if p.returncode != 0 or not self.rpm_paths:
       print('Error calling rpmbuild:')
       print(output)
     elif self.debug:
@@ -417,20 +421,33 @@ def CallRpmBuild(self, dirname, rpmbuild_args):
     # Return the status.
     return p.returncode
 
-  def SaveResult(self, out_file):
+  def SaveResult(self, out_file, subpackage_out_files):
     """Save the result RPM out of the temporary working directory."""
 
-    if self.rpm_path:
-      shutil.copy(self.rpm_path, out_file)
+    if self.rpm_paths:
+      rpm_path = self.rpm_paths[0]
+      shutil.copy(rpm_path, out_file)
       if self.debug:
         print('Saved RPM file to %s' % out_file)
+
+      subrpm_paths = self.rpm_paths[1:]
+      for s_name, s_out_file in subpackage_out_files:
+         s_prefix = self.name + '-' + s_name
+
+         for p in subrpm_paths:
+            if os.path.basename(p).startswith(s_prefix):
+               shutil.copy(p, s_out_file)
+               if self.debug:
+                  print('Saved %s sub RPM file to %s' % (s_name, s_out_file))
+               break
     else:
       print('No RPM file created.')
 
-  def Build(self, spec_file, out_file,
+  def Build(self, spec_file, out_file, subpackage_out_files,
             preamble_file=None,
             description_file=None,
             install_script_file=None,
+            subpackages_file=None,
             pre_scriptlet_path=None,
             post_scriptlet_path=None,
             preun_scriptlet_path=None,
@@ -446,20 +463,24 @@ def Build(self, spec_file, out_file,
     original_dir = os.getcwd()
     spec_file = os.path.join(original_dir, spec_file)
     out_file = os.path.join(original_dir, out_file)
+    subpackage_out_files = (s.split(':') for s in subpackage_out_files)
+    subpackage_out_files = [
+       (s[0], os.path.join(original_dir, s[1])) for s in subpackage_out_files]
     with Tempdir() as dirname:
       self.SetupWorkdir(spec_file,
                         original_dir,
                         preamble_file=preamble_file,
                         description_file=description_file,
                         install_script_file=install_script_file,
+                        subpackages_file=subpackages_file,
                         file_list_path=file_list_path,
                         pre_scriptlet_path=pre_scriptlet_path,
                         post_scriptlet_path=post_scriptlet_path,
                         preun_scriptlet_path=preun_scriptlet_path,
                         postun_scriptlet_path=postun_scriptlet_path,
                         changelog_file=changelog_file)
       status = self.CallRpmBuild(dirname, rpmbuild_args or [])
-      self.SaveResult(out_file)
+      self.SaveResult(out_file, subpackage_out_files)
 
     return status
 
@@ -482,6 +503,9 @@ def main(argv):
                       help='The file containing the RPM specification.')
   parser.add_argument('--out_file', required=True,
                       help='The destination to save the resulting RPM file to.')
+  parser.add_argument('--subpackage_out_file', action='append',
+                      help='List of destinations to save resulting ' +
+                      'subpackage RPMs to in the form of name:destination')
   parser.add_argument('--rpmbuild', help='Path to rpmbuild executable.')
   parser.add_argument('--source_date_epoch',
                       help='Value for the SOURCE_DATE_EPOCH rpmbuild '
@@ -498,6 +522,8 @@ def main(argv):
                       help='File containing the RPM Preamble')
   parser.add_argument('--description',
                       help='File containing the RPM %description text')
+  parser.add_argument('--subpackages',
+                      help='File containing the RPM subpackage details')
   parser.add_argument('--pre_scriptlet',
                       help='File containing the RPM %pre scriptlet, if to be substituted')
   parser.add_argument('--post_scriptlet',
@@ -528,9 +554,11 @@ def main(argv):
                          debug=options.debug)
     builder.AddFiles(options.files)
     return builder.Build(options.spec_file, options.out_file,
+                         options.subpackage_out_file,
                          preamble_file=options.preamble,
                          description_file=options.description,
                          install_script_file=options.install_script,
+                         subpackages_file=options.subpackages,
                          file_list_path=options.file_list,
                          pre_scriptlet_path=options.pre_scriptlet,
                          post_scriptlet_path=options.post_scriptlet,

pkg/rpm/template.spec.tpl

@@ -19,4 +19,6 @@ ${PREUN_SCRIPTLET}
 
 ${POSTUN_SCRIPTLET}
 
+${SUBPACKAGES}
+
 ${CHANGELOG}

pkg/rpm_pfg.bzl

@@ -33,6 +33,10 @@ load(
     "PackageSymlinkInfo",
     "PackageVariablesInfo",
 )
+load(
+    "//pkg:rpm_providers.bzl",
+    "SubRPMInfo",
+)
 load("//pkg/private:util.bzl", "setup_output_files", "substitute_package_variables")
 
 rpm_filetype = [".rpm"]
@@ -285,6 +289,54 @@ def _process_dep(dep, process_ctx):
                 process_ctx,
             )
 
+def _process_subpackage(rpm_info):
+    process_ctx = struct(
+        dest_check_map = {},
+        install_script_pieces = [],
+        packaged_directories = [],
+        rpm_files_list = [],
+    )
+
+    rpm_lines = [
+       "%%package %s" % rpm_info.package_name,
+       "Summary: %s" % rpm_info.summary,
+    ]
+
+    if rpm_info.architecture:
+        rpm_lines += [ "BuildArch: %s" % rpm_info.architecture ]
+
+    if rpm_info.version:
+        rpm_lines += [ "Version: %s" % rpm_info.version ]
+
+    for r in rpm_info.requires:
+        rpm_lines += [ "Requires: %s" % r ]
+
+    rpm_lines += [
+        "",
+        "%%description %s" % rpm_info.package_name,
+        rpm_info.description,
+    ]
+
+    if rpm_info.post_scriptlet:
+        rpm_lines += [
+            "",
+            "%%post %s" % rpm_info.package_name,
+        ]
+
+    if rpm_info.srcs:
+        rpm_lines += [
+            "",
+            "%%files %s" % rpm_info.package_name,
+        ]
+
+        for dep in rpm_info.srcs:
+            _process_dep(dep, process_ctx)
+
+        rpm_lines += process_ctx.rpm_files_list
+        rpm_lines += [""]
+
+    return rpm_lines, process_ctx.install_script_pieces, process_ctx.packaged_directories
+
 #### Rule implementation
 
 def _pkg_rpm_impl(ctx):
@@ -338,12 +390,14 @@ def _pkg_rpm_impl(ctx):
             ctx.attr.architecture,
         )
 
-    outputs, output_file, output_name = setup_output_files(
+    outputs, output_file, _ = setup_output_files(
         ctx,
         package_file_name = package_file_name,
         default_output_file = default_file,
     )
 
+    output_rpm_files = [output_file]
+
     #### rpm spec "preamble"
     preamble_pieces = []
 
@@ -523,7 +577,7 @@ def _pkg_rpm_impl(ctx):
     args.append("--out_file=" + output_file.path)
 
     # Add data files
-    files += ctx.files.srcs
+    files += ctx.files.srcs + ctx.files.subpackages
 
     #### Consistency checking; input processing
 
@@ -563,6 +617,54 @@ def _pkg_rpm_impl(ctx):
     for dep in ctx.attr.srcs:
         _process_dep(dep, process_ctx)
 
+    #### subpackages
+    subpackage_file = ctx.actions.declare_file(
+        "{}.spec.subpackages".format(rpm_name),
+    )
+    if ctx.attr.subpackages:
+        subpackage_lines = []
+        
+        for s in ctx.attr.subpackages:
+            s_rpm_info = s[SubRPMInfo]
+            s_lines, s_install_script_pieces, s_packaged_directories = _process_subpackage(s_rpm_info)
+
+            subpackage_lines += s_lines
+            install_script_pieces += s_install_script_pieces
+            packaged_directories += s_packaged_directories
+
+            s_package_file_name = "%s-%s-%s-%s.%s.rpm" % (
+                rpm_name,
+                s_rpm_info.package_name,
+                s_rpm_info.version or ctx.attr.version,
+                ctx.attr.release,
+                s_rpm_info.architecture or ctx.attr.architecture,
+            )
+
+            s_default_file = ctx.actions.declare_file("{}-{}.rpm".format(rpm_name, s_rpm_info.package_name))
+            s_outputs, s_output_file, _ = setup_output_files(
+                ctx,
+                package_file_name = s_package_file_name,
+                default_output_file = s_default_file,
+            )
+
+            outputs += s_outputs
+            output_rpm_files.append(s_output_file)
+            
+            args += [ "--subpackage_out_file=%s:%s" % (
+                s_rpm_info.package_name, s_output_file.path) ]
+            
+        ctx.actions.write(
+            output = subpackage_file,
+            content = "\n".join(subpackage_lines),
+        )
+    else:
+        ctx.actions.write(
+            output = subpackage_file,
+            content = "# no subpackages",
+        )
+    files.append(subpackage_file)
+    args.append("--subpackages=" + subpackage_file.path)
+
     #### Procedurally-generated scripts/lists (%install, %files)
 
     # We need to write these out regardless of whether we are using
@@ -641,7 +743,7 @@ def _pkg_rpm_impl(ctx):
 
     args.extend(["--rpmbuild_arg=" + a for a in additional_rpmbuild_args])
 
-    for f in ctx.files.srcs:
+    for f in ctx.files.srcs + ctx.files.subpackages:
         args.append(f.path)
 
     #### Call the generator script.
@@ -652,7 +754,7 @@ def _pkg_rpm_impl(ctx):
         use_default_shell_env = True,
         arguments = args,
         inputs = files,
-        outputs = [output_file],
+        outputs = output_rpm_files,
         env = {
             "LANG": "en_US.UTF-8",
             "LC_CTYPE": "UTF-8",
@@ -668,7 +770,7 @@ def _pkg_rpm_impl(ctx):
 
     output_groups = {
         "out": [default_file],
-        "rpm": [output_file],
+        "rpm": output_rpm_files,
         "changes": changes
     }
     return [
@@ -1012,6 +1114,12 @@ pkg_rpm = rule(
             overcommitting your system.
             """,
         ),
+        "subpackages": attr.label_list(
+            doc = """Subpackages to build with this RPM""",
+            providers = [
+                [SubRPMInfo],
+            ],
+        ),
         "rpmbuild_path": attr.string(
             doc = """Path to a `rpmbuild` binary.  Deprecated in favor of the rpmbuild toolchain""",
         ),