diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-03-23 20:50:36 +0000 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-05-05 15:07:54 +0200 |
| commit | df058a250f3845e9126ec0d684fafc4d302b0afe (patch) | |
| tree | 7d4af40739dc1c64b6234d4380f4c7a5f9fa5f19 | |
| parent | 0f54ee83e570105a3e01ea6130219009271e3917 (diff) | |
| download | vyos-build-df058a250f3845e9126ec0d684fafc4d302b0afe.tar.gz vyos-build-df058a250f3845e9126ec0d684fafc4d302b0afe.zip | |
build scripts: T3664: move image build scripts to a dedicated directory
to avoid a mix of image build scripts and ancilliary scripts in the same directory
(cherry picked from commit 750819bfec5335566dfc48de1ab6dbbc869068a3)
| l--------- | build-vyos-image | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image (renamed from scripts/build-vyos-image) | 5 | ||||
| -rw-r--r-- | scripts/image-build/defaults.py (renamed from scripts/vyos_build_defaults.py) | 2 | ||||
| -rw-r--r-- | scripts/image-build/utils.py (renamed from scripts/vyos_build_utils.py) | 5 |
4 files changed, 8 insertions, 6 deletions
diff --git a/build-vyos-image b/build-vyos-image index 360be935..0c61a9d5 120000 --- a/build-vyos-image +++ b/build-vyos-image @@ -1 +1 @@ -scripts/build-vyos-image
\ No newline at end of file +scripts/image-build/build-vyos-image
\ No newline at end of file diff --git a/scripts/build-vyos-image b/scripts/image-build/build-vyos-image index aa0a6aad..59ea0338 100755 --- a/scripts/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -40,8 +40,9 @@ except ModuleNotFoundError as e: print(f"Cannot load a required library: {e}") print("Please make sure the following Python3 modules are installed: tomli jinja2 git") -import vyos_build_utils as utils -import vyos_build_defaults as defaults +# Local modules +import utils +import defaults # argparse converts hyphens to underscores, # so for lookups in the original options hash we have to convert them back diff --git a/scripts/vyos_build_defaults.py b/scripts/image-build/defaults.py index 1e153f4b..1d7141ea 100644 --- a/scripts/vyos_build_defaults.py +++ b/scripts/image-build/defaults.py @@ -1,4 +1,4 @@ -# Copyright (C) 2018 VyOS maintainers and contributors +# Copyright (C) 2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as diff --git a/scripts/vyos_build_utils.py b/scripts/image-build/utils.py index ed358848..6906c52d 100644 --- a/scripts/vyos_build_utils.py +++ b/scripts/image-build/utils.py @@ -1,4 +1,4 @@ -# Copyright (C) 2015 VyOS maintainers and contributors +# Copyright (C) 2024 VyOS maintainers and contributors # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License version 2 or later as @@ -21,7 +21,8 @@ import sys import os from distutils.spawn import find_executable -import vyos_build_defaults as defaults +# Local modules +import defaults def check_build_config(): if not os.path.exists(defaults.BUILD_CONFIG): |