diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-11-20 21:00:13 +0100 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-11-20 21:00:13 +0100 |
| commit | e6410e0ac447ef7b58f1c8f54a15d4894a5fb43f (patch) | |
| tree | 6b44ef1df329de07b5b5bdfd2d31666be315c075 | |
| parent | fd70535df232c40e27cec020465f481d4f97b85f (diff) | |
| parent | ab588e47f88df59f0ca85c758cbf9b1942004183 (diff) | |
| download | vyos-build-e6410e0ac447ef7b58f1c8f54a15d4894a5fb43f.tar.gz vyos-build-e6410e0ac447ef7b58f1c8f54a15d4894a5fb43f.zip | |
Merge branch 'vyos:current' into current
| -rwxr-xr-x | scripts/utils/merge-flavors | 3 |
1 files changed, 3 insertions, 0 deletions
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) |