Merge branch 'master' into clark

2 files changed, 102 insertions, 0 deletions

diff --git a/py/mock.py b/py/mock.py
index 00c8968..492d8b2 100755
--- a/py/mock.py
+++ b/py/mock.py
@@ -72,6 +72,9 @@ def command_parse(config_opts):
     parser.add_option("--rebuild", action="store_const", const="rebuild",
                       dest="mode", default='rebuild',
                       help="rebuild the specified SRPM(s)")
+    parser.add_option("--buildsrpm", action="store_const", const="buildsrpm",
+                      dest="mode",
+                      help="Build a SRPM from spec (--spec ...) and sources (--sources ...)")
     parser.add_option("--shell", action="store_const",
                       const="shell", dest="mode",
                       help="run the specified command interactively within the chroot."
@@ -157,6 +160,11 @@ def command_parse(config_opts):
                       help="Change to the specified directory (relative to the chroot)"
                            " before running command when using --chroot")
 
+    parser.add_option("--spec", action="store",
+                    help="Specifies spec file to use to build an SRPM (used only with --buildsrpm)")
+    parser.add_option("--sources", action="store",
+                    help="Specifies sources to use to build an SRPM (used only with --buildsrpm)")
+
     # verbosity
     parser.add_option("-v", "--verbose", action="store_const", const=2,
                       dest="verbose", default=1, help="verbose build")
@@ -378,6 +386,38 @@ def do_rebuild(config_opts, chroot, srpms):
             chroot.clean()
         raise
 
+def do_buildsrpm(config_opts, chroot, options, args):
+    start = time.time()
+    try:
+        # TODO: validate spec path (exists)
+        # TODO: validate SOURCES path (exists)
+
+        log.info("Start(%s)  Config(%s)" % (os.path.basename(options.spec), chroot.sharedRootName))
+        if config_opts['clean'] and chroot.state() != "clean":
+            chroot.clean()
+        chroot.init()
+
+        chroot.buildsrpm(spec=options.spec, sources=options.sources, timeout=config_opts['rpmbuild_timeout'])
+
+        elapsed = time.time() - start
+        log.info("Done(%s) Config(%s) %d minutes %d seconds"
+            % (os.path.basename(options.spec), config_opts['chroot_name'], elapsed//60, elapsed%60))
+        log.info("Results and/or logs in: %s" % chroot.resultdir)
+
+        if config_opts["cleanup_on_success"]:
+            log.info("Cleaning up build root ('clean_on_success=True')")
+            chroot.clean()
+
+    except (Exception, KeyboardInterrupt):
+        elapsed = time.time() - start
+        log.error("Exception(%s) Config(%s) %d minutes %d seconds"
+            % (os.path.basename(options.spec), chroot.sharedRootName, elapsed//60, elapsed%60))
+        log.info("Results and/or logs in: %s" % chroot.resultdir)
+        if config_opts["cleanup_on_failure"]:
+            log.info("Cleaning up build root ('clean_on_failure=True')")
+            chroot.clean()
+        raise
+
 def main(ret):
     "Main executable entry point."
     # drop unprivleged to parse args, etc.
@@ -579,6 +619,9 @@ def main(ret):
     elif options.mode == 'rebuild':
         do_rebuild(config_opts, chroot, args)
 
+    elif options.mode == 'buildsrpm':
+        do_buildsrpm(config_opts, chroot, options, args)
+
     elif options.mode == 'orphanskill':
         mock.util.orphansKill(chroot.makeChrootPath())
     elif options.mode == 'copyin':
diff --git a/py/mock/backend.py b/py/mock/backend.py
index d812743..8c0032f 100644
--- a/py/mock/backend.py
+++ b/py/mock/backend.py
@@ -444,6 +444,65 @@ class Root(object):
             # tell caching we are done building
             self._callHooks('postbuild')
 
+
+    #
+    # UNPRIVLEGED:
+    #   Everything in this function runs as the build user
+    #       -> except hooks. :)
+    #
+    decorate(traceLog())
+    def buildsrpm(self, spec, sources, timeout):
+        """build an srpm into binary rpms, capture log"""
+
+        # tell caching we are building
+        self._callHooks('earlyprebuild')
+
+        try:
+            self._mountall()
+            self.uidManager.becomeUser(self.chrootuid, self.chrootgid)
+            self.state("setup")
+
+            # copy spec/sources
+            shutil.copy(spec, self.makeChrootPath(self.builddir, "SPECS"))
+            os.rmdir(self.makeChrootPath(self.builddir, "SOURCES"))
+            shutil.copytree(sources, self.makeChrootPath(self.builddir, "SOURCES"))
+
+            spec =  self.makeChrootPath(self.builddir, "SPECS", os.path.basename(spec))
+            chrootspec = spec.replace(self.makeChrootPath(), '') # get rid of rootdir prefix
+
+            # Completely/Permanently drop privs while running the following:
+            self.state("buildsrpm")
+            os.environ["HOME"] = self.homedir
+            self.doChroot(
+                ["bash", "--login", "-c", 'rpmbuild -bs --target %s --nodeps %s' % (self.rpmbuild_arch, chrootspec)],
+                shell=False,
+                logger=self.build_log, timeout=timeout,
+                uid=self.chrootuid,
+                gid=self.chrootgid,
+                )
+
+            rebuiltSrpmFile = glob.glob("%s/%s/SRPMS/*.src.rpm" % (self.makeChrootPath(), self.builddir))
+            if len(rebuiltSrpmFile) != 1:
+                raise mock.exception.PkgError, "Didnt find single rebuilt srpm."
+
+            rebuiltSrpmFile = rebuiltSrpmFile[0]
+
+            srpms = glob.glob(self.makeChrootPath(self.builddir) + '/SRPMS/*.rpm')
+            self.root_log.debug("Copying packages to result dir")
+            for item in srpms:
+                shutil.copy2(item, self.resultdir)
+
+        finally:
+            self.uidManager.restorePrivs()
+            self._umountall()
+
+            # tell caching we are done building
+            self._callHooks('postbuild')
+
+
+
+
+
     # =============
     # 'Private' API
     # =============