From 86dbb354444f504157c00493988a6d7c4d74210f Mon Sep 17 00:00:00 2001 From: "biao716.wang" Date: Mon, 10 May 2021 17:52:37 +0900 Subject: [PATCH] Add new feature: Support build with sub modules togeter Change-Id: I95a19c957e2d47176c99ebb922eb16f19ace00a3 Signed-off-by: biao716.wang --- gitbuildsys/cmd_build.py | 2 ++ gitbuildsys/cmd_export.py | 2 ++ tools/gbs | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 0041dea..bd1b467 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -245,6 +245,8 @@ def prepare_depanneur_simple_opts(args): cmd_opts += ['--style=%s' % args.style] if args.export_only: cmd_opts += ['--export-only'] + if args.with_submodules: + cmd_opts += ['--with-submodules'] return cmd_opts diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py index 3d22844..eed8261 100644 --- a/gitbuildsys/cmd_export.py +++ b/gitbuildsys/cmd_export.py @@ -205,6 +205,8 @@ def create_gbp_export_args(repo, commit, export_dir, tmp_dir, spec, args, ]) else: argv.extend(["--git-builder=osc", "--git-no-build"]) + if args.with_submodules: + argv.append('--git-submodules') return argv diff --git a/tools/gbs b/tools/gbs index 2d9796f..bcab783 100755 --- a/tools/gbs +++ b/tools/gbs @@ -136,6 +136,8 @@ def export_parser(parser): parser.add_argument('--outdir-directly', action='store_true', help='Use the directory of --outdir parameter directly' 'rather than outdir/pkg-version-release') + parser.add_argument('--with-submodules', action='store_true', + help='export source code also with submodule code togerther') parser.set_defaults(alias="ex") return parser @@ -343,6 +345,8 @@ def build_parser(parser): 'either comma separated string or local file location.') group.add_argument('--profiling', default='', help='Profiling report location to be used package ordering.') + group.add_argument('--with-submodules', action='store_true', + help='build project with submodules togerther') parser.set_defaults(alias="lb") return parser -- 2.34.1