diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2023-11-17 15:30:36 +0530 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2023-11-17 13:00:46 +0000 |
| commit | 0ea38404d160e2a6988fd6c78ed4b0e3221d262c (patch) | |
| tree | 06bf39546fcf22156e763edc8c0193919d09e8ce | |
| parent | 651c103f3a43d82588388b1191285c99aed4c42d (diff) | |
cerbero: Fix bundle-source not including build-tools recipes
Fixes https://gitlab.freedesktop.org/gstreamer/cerbero/-/issues/458
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/1307>
| -rw-r--r-- | cerbero/commands/bundlesource.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/cerbero/commands/bundlesource.py b/cerbero/commands/bundlesource.py index 2cf3173e..ec06f136 100644 --- a/cerbero/commands/bundlesource.py +++ b/cerbero/commands/bundlesource.py @@ -85,11 +85,6 @@ class BundleSource(Command): for p in packages: setup_args.append('--package=' + p) - for r in bundle_recipes: - setup_args.append('--recipe=' + r.name) - if r.stype != SourceType.CUSTOM: - bundle_dirs.append(r.repo_dir) - if not args.no_bootstrap: build_tools = BuildTools(config, args.offline) bs_recipes = build_tools.BUILD_TOOLS + \ @@ -100,9 +95,15 @@ class BundleSource(Command): b_recipes = remove_list_duplicates(b_recipes) for r in b_recipes: + bundle_recipes.append(r) if r.stype != SourceType.CUSTOM: bundle_dirs.append(r.repo_dir) + for r in set(bundle_recipes): + setup_args.append('--recipe=' + r.name) + if r.stype != SourceType.CUSTOM: + bundle_dirs.append(r.repo_dir) + setup_args.append('--source-dirs=' + ','.join(bundle_dirs)) command = str(config._relative_path('setup.py')) |