diff options
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 2 | ||||
| -rwxr-xr-x | scripts/utils/merge-flavors | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 8e28da12..dfa5dfbe 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -63,7 +63,7 @@ except Exception as e: # Checkout vyos-1x under build directory try: branch_name = build_defaults['vyos_branch'] - url_vyos_1x = 'https://github.com/vyos/vyos-1x' + url_vyos_1x = os.getenv('VYOS1X_REPO_URL', default='https://github.com/vyos/vyos-1x') path_vyos_1x = os.path.join(defaults.BUILD_DIR, 'vyos-1x') try: repo_vyos_1x = git.Repo.clone_from(url_vyos_1x, path_vyos_1x, no_checkout=True) diff --git a/scripts/utils/merge-flavors b/scripts/utils/merge-flavors index 013014e0..79f8180e 100755 --- a/scripts/utils/merge-flavors +++ b/scripts/utils/merge-flavors @@ -58,6 +58,9 @@ if __name__ == '__main__': if 'architectures' not in base_flavor: base_flavor['architectures'] = {} + if 'packages' not in base_flavor: + base_flavor['packages'] = [] + flavor_files = sys.argv[2:] flavor_defs = map(load_flavor, flavor_files) |