File 0005-Add-support-for-rebuild-and-chroot-only-in... of Package osc

Overview Repositories Revisions Requests Users Attributes Meta

File 0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch of Package osc (Revision c4758cc25b3a0e4b282aa6edaddf97d7)

Currently displaying revision c4758cc25b3a0e4b282aa6edaddf97d7 , Show latest

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Marko Lemmetty <marko.lemmetty@jollamobile.com>
Date: Fri, 15 May 2020 15:04:41 +0300
Subject: [PATCH] Add support for --rebuild and --chroot-only in build.
 --rebuild sends --skip-prep to build and rpm to skip the %prep phase. This is
 useful in conjunction with the --rsync* options to enable rapid rebuilds in
 the clean rpmbuild environment.

--chroot-only creates a chroot without doing a build - this can be used to
    build scratchbox2 targets
---
 osc/build.py       | 7 +++++++
 osc/commandline.py | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/osc/build.py b/osc/build.py
index 962060a6bd598c9b02c7073e9afe069b58201ca7..25d7ab784dedb35a88f55d4520ce6bdfe948b5d2 100644
--- a/osc/build.py
+++ b/osc/build.py
@@ -798,6 +798,13 @@ def main(apiurl, store, opts, argv):
         buildargs.append('--clean')
     if opts.checks:
         buildargs.append('--checks')
+    if opts.rebuild:
+        if not opts.rsyncsrc or not opts.rsyncdest:
+            print('Warning: --rebuild option is usually used with both --rsync-src and --rsync-dest',
+                  file=sys.stderr)
+        buildargs.append('--skip-prep')
+    if opts.chroot_only:
+        buildargs.append('--chroot-only')
     if opts.nochecks:
         buildargs.append('--no-checks')
     if not opts.no_changelog:
diff --git a/osc/commandline.py b/osc/commandline.py
index b894ebe7ba233c98266bd13aa9ecbfbb3e2ffc62..f2759b19311bad5e5cf94f278adc862ea994aa52 100644
--- a/osc/commandline.py
+++ b/osc/commandline.py
@@ -7250,6 +7250,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                   help='Skip initialization of build root and start with build immediately.')
     @cmdln.option('--checks', action='store_true',
                   help='Run checks even if disabled in the build config')
+    @cmdln.option('--rebuild', action='store_true',
+                  help='During build, skip the %%prep and %%clean phases; requires --rsync options')
+    @cmdln.option('--chroot-only', action='store_true',
+                  help='Only initialise build root and skip build.')
     @cmdln.option('--nochecks', '--no-checks', action='store_true',
                   help='Do not run build checks on the resulting packages.')
     @cmdln.option('--no-verify', '--noverify', action='store_true',

Places

File 0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch of Package osc (Revision c4758cc25b3a0e4b282aa6edaddf97d7)

Places