1 files changed, 47 insertions, 0 deletions
diff --git a/0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch b/0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
new file mode 100644
index 000000000000..44568de74396
--- /dev/null
+++ b/0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
@@ -0,0 +1,47 @@
+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       | 6 ++++++
+ osc/commandline.py | 4 ++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/osc/build.py b/osc/build.py
+index 096e6c40998e35650b857d09cce41cfc95e10f67..ef18a0b8cb61ae96a013f526775cd7644acce648 100644
+--- a/osc/build.py
++++ b/osc/build.py
+@@ -727,6 +727,12 @@ def main(apiurl, store, opts, argv):
+         buildargs.append('--norootforbuild')
+     if opts.clean:
+         buildargs.append('--clean')
++    if opts.rebuild:
++        if not opts.rsyncsrc or not opts.rsyncdest:
++            print >>sys.stderr, 'Warning: --rebuild option is usually used with both --rsync-src and --rsync-dest'
++        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 2eff6bfb2a38a7919d2c1850a57f49ebe7feba92..2e575eddd4aa044ca53c4677fd8a99a8d92890c8 100644
+--- a/osc/commandline.py
++++ b/osc/commandline.py
+@@ -7119,6 +7119,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
+                   help='Copy overlay filesystem to buildroot after installing all RPMs .')
+     @cmdln.option('--noinit', '--no-init', action='store_true',
+                   help='Skip initialization of build root and start with build immediately.')
++    @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',