]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
build-with-container.py: Add --rpmbuild-extra-args 62016/head
authorZack Cerza <zack@cerza.org>
Tue, 25 Feb 2025 16:15:32 +0000 (09:15 -0700)
committerZack Cerza <zack@cerza.org>
Wed, 5 Mar 2025 20:40:03 +0000 (13:40 -0700)
Signed-off-by: Zack Cerza <zack@cerza.org>
src/script/build-with-container.py

index 2a0cb43818eec929bd4d9b466d7a9a724e7f17a8..aee8658c98c687bd3c3a758dca2603ca70ad8043 100755 (executable)
@@ -636,12 +636,18 @@ def bc_build_rpm(ctx):
         topdir = (
             pathlib.Path(ctx.cli.homedir) / ctx.cli.build_dir / "rpmbuild"
         )
+    rpmbuild_args = [
+        'rpmbuild',
+        '--rebuild',
+        f'-D_topdir {topdir}',
+    ] + list(ctx.cli.rpmbuild_arg) + [str(srpm_path)]
+    rpmbuild_cmd = ' '.join(shlex.quote(cmd) for cmd in rpmbuild_args)
     cmd = _container_cmd(
         ctx,
         [
             "bash",
             "-c",
-            f"set -x; mkdir -p {topdir} && rpmbuild --rebuild -D'_topdir {topdir}' {srpm_path}",
+            f"set -x; mkdir -p {topdir} && {rpmbuild_cmd}",
         ],
     )
     with ctx.user_command():
@@ -855,6 +861,12 @@ def parse_cli(build_step_names):
             " git checkout. Use any source RPM available."
         ),
     )
+    parser.add_argument(
+        "--rpmbuild-arg",
+        '-R',
+        action="append",
+        help="Pass this extra argument to rpmbuild",
+    )
     parser.add_argument(
         "--ceph-version",
         help="Rather than infer the Ceph version, use this value",