From: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Currently we are no able to build with configuration fragments in our CI. With this patch buildman gets a new argument --fragments for passing a comma-separated list of configuration fragments to add to the board defconfigs, e.g. tools/buildman/buildman \ -o build \ -k qemu-riscv64_smode \ --fragments acpi.config Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- tools/buildman/builder.py | 5 ++++- tools/buildman/builderthread.py | 18 +++++++++++------- tools/buildman/cmdline.py | 2 ++ tools/buildman/control.py | 3 ++- tools/buildman/test.py | 2 +- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/tools/buildman/builder.py b/tools/buildman/builder.py index 9516e25e215..3511dba4e71 100644 --- a/tools/buildman/builder.py +++ b/tools/buildman/builder.py @@ -1789,7 +1789,8 @@ class Builder: shutil.rmtree(dirname) terminal.print_clear() - def build_boards(self, commits, board_selected, keep_outputs, verbose): + def build_boards(self, commits, board_selected, keep_outputs, verbose, + fragments): """Build all commits for a list of boards Args: @@ -1798,6 +1799,7 @@ class Builder: value is Board object keep_outputs: True to save build output files verbose: Display build results as they are completed + fragments (str): config fragments added to defconfig Returns: Tuple containing: - number of boards that failed to build @@ -1827,6 +1829,7 @@ class Builder: job.keep_outputs = keep_outputs job.work_in_output = self.work_in_output job.adjust_cfg = self.adjust_cfg + job.fragments = fragments job.step = self._step if self.num_threads: self.queue.put(job) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index a249174f158..a037c23fb81 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -389,7 +389,7 @@ class BuilderThread(threading.Thread): def _config_and_build(self, commit_upto, brd, work_dir, do_config, mrproper, config_only, adjust_cfg, commit, out_dir, out_rel_dir, - result): + fragments, result): """Do the build, configuring first if necessary Args: @@ -404,6 +404,7 @@ class BuilderThread(threading.Thread): out_dir (str): Output directory for the build, or None to use current out_rel_dir (str): Output directory relatie to the current dir + fragments (str): config fragments added to defconfig result (CommandResult): Previous result Returns: @@ -420,6 +421,8 @@ class BuilderThread(threading.Thread): args, cwd, src_dir = self._build_args(brd, out_dir, out_rel_dir, work_dir, commit_upto) config_args = [f'{brd.target}_defconfig'] + if fragments != None: + config_args.extend(fragments.split(',')) config_out = io.StringIO() _remove_old_outputs(out_dir) @@ -458,7 +461,7 @@ class BuilderThread(threading.Thread): def run_commit(self, commit_upto, brd, work_dir, do_config, mrproper, config_only, force_build, force_build_failures, - work_in_output, adjust_cfg): + work_in_output, adjust_cfg, fragments): """Build a particular commit. If the build is already done, and we are not forcing a build, we skip @@ -483,6 +486,7 @@ class BuilderThread(threading.Thread): ~C to disable C C=val to set the value of C (val must have quotes if C is a string Kconfig + fragments (str): config fragments added to defconfig Returns: tuple containing: @@ -512,7 +516,7 @@ class BuilderThread(threading.Thread): result, do_config = self._config_and_build( commit_upto, brd, work_dir, do_config, mrproper, config_only, adjust_cfg, commit, out_dir, out_rel_dir, - result) + fragments, result) result.already_done = False result.toolchain = self.toolchain @@ -710,7 +714,7 @@ class BuilderThread(threading.Thread): self.builder.config_only, force_build or self.builder.force_build, self.builder.force_build_failures, - job.work_in_output, job.adjust_cfg) + job.work_in_output, job.adjust_cfg, job.fragments) failed = result.return_code or result.stderr did_config = do_config if failed and not do_config and not self.mrproper: @@ -721,7 +725,7 @@ class BuilderThread(threading.Thread): brd, work_dir, True, self.mrproper or self.builder.fallback_mrproper, False, True, False, job.work_in_output, - job.adjust_cfg) + job.adjust_cfg, job.fragments) did_config = True if not self.builder.force_reconfig: do_config = request_config @@ -767,14 +771,14 @@ class BuilderThread(threading.Thread): result, request_config = self.run_commit(None, brd, work_dir, True, self.mrproper, self.builder.config_only, True, self.builder.force_build_failures, job.work_in_output, - job.adjust_cfg) + job.adjust_cfg, job.fragments) failed = result.return_code or result.stderr if failed and not self.mrproper: result, request_config = self.run_commit(None, brd, work_dir, True, self.builder.fallback_mrproper, self.builder.config_only, True, self.builder.force_build_failures, - job.work_in_output, job.adjust_cfg) + job.work_in_output, job.adjust_cfg, job.fragments) result.commit_upto = 0 self._write_result(result, job.keep_outputs, job.work_in_output) diff --git a/tools/buildman/cmdline.py b/tools/buildman/cmdline.py index 9236d6187cf..e194712c37f 100644 --- a/tools/buildman/cmdline.py +++ b/tools/buildman/cmdline.py @@ -63,6 +63,8 @@ def add_upto_m(parser): help="Fetch a toolchain for architecture FETCH_ARCH ('list' to list)." ' You can also fetch several toolchains separate by comma, or' " 'all' to download all") + parser.add_argument('--fragments', type=str, + help="Comma separated list of configuration fragments to be applied") parser.add_argument( '--full-check', action='store_true', help='Check maintainer entries and TARGET configs') diff --git a/tools/buildman/control.py b/tools/buildman/control.py index 4dedd333551..69ee4074273 100644 --- a/tools/buildman/control.py +++ b/tools/buildman/control.py @@ -564,7 +564,8 @@ def run_builder(builder, commits, board_selected, args): builder.show_summary(commits, board_selected) else: fail, warned, excs = builder.build_boards( - commits, board_selected, args.keep_outputs, args.verbose) + commits, board_selected, args.keep_outputs, args.verbose, + args.fragments) if excs: return 102 if fail: diff --git a/tools/buildman/test.py b/tools/buildman/test.py index 7ee9496ffb3..735203e934c 100644 --- a/tools/buildman/test.py +++ b/tools/buildman/test.py @@ -237,7 +237,7 @@ class TestBuild(unittest.TestCase): # Build the boards for the pre-defined commits and warnings/errors # associated with each. This calls our Make() to inject the fake output. build.build_boards(self.commits, board_selected, keep_outputs=False, - verbose=False) + verbose=False, fragments='') lines = terminal.get_print_test_lines() count = 0 for line in lines: -- 2.43.0