run.sh: --rpmbuild-stage to override "-ba"

Notably useful for -bp, to
- quickly get a patched source tree
- apply patches using quilt, in order to refresh them in 8.3 env, so they
  will not be rejected by the 9.0 one

Signed-off-by: Yann Dirson <yann.dirson@vates.tech>

Author: ydirson

files/init-container.sh

@@ -86,8 +86,10 @@ if [ -n "$BUILD_LOCAL" ]; then
         esac
 
         sudo $BDEP "${SPECFLAGS[@]}" -y $specs
+
+        : ${RPMBUILD_STAGE:=a}  # default if not specified: -ba
         RPMBUILDFLAGS=(
-            -ba $specs
+            -b${RPMBUILD_STAGE} $specs
             --target "$RPMARCH"
             $RPMBUILD_OPTS
             "${SPECFLAGS[@]}"

run.py

@@ -18,6 +18,7 @@
 
 DEFAULT_BRANCH = '8.3'
 DEFAULT_ULIMIT_NOFILE = 2048
+RPMBUILD_STAGES = "abpfcilsrd"  # valid X values in `rpmbuild -bX`
 
 RUNNER = os.getenv("XCPNG_OCI_RUNNER")
 if RUNNER is None:
@@ -55,6 +56,8 @@ def main():
                              "version of a package which exists in both 'base' and 'extras' versions.")
     parser.add_argument('--rpmbuild-opts', action='append',
                         help="Pass additional option(s) to rpmbuild")
+    parser.add_argument('--rpmbuild-stage', action='store',
+                        help=f"Request given -bX stage rpmbuild, X in [{RPMBUILD_STAGES}]")
     parser.add_argument('-o', '--output-dir',
                         help="Output directory for --build-local.")
     parser.add_argument('-n', '--no-exit', action='store_true',
@@ -115,6 +118,10 @@ def main():
         docker_args += ["-e", "RPMBUILD_DEFINE=%s" % args.define]
     if args.rpmbuild_opts:
         docker_args += ["-e", "RPMBUILD_OPTS=%s" % ' '.join(args.rpmbuild_opts)]
+    if args.rpmbuild_stage:
+        if args.rpmbuild_stage not in RPMBUILD_STAGES:
+            parser.error(f"--rpmbuild-stage={args.rpmbuild_stage} not in '{RPMBUILD_STAGES}'")
+        docker_args += ["-e", f"RPMBUILD_STAGE={args.rpmbuild_stage}"]
     if args.output_dir:
         if not os.path.isdir(args.output_dir):
             parser.error("%s is not a valid output directory." %