Merge pull request #541 from dmbaturin/T3664-move-image-build-scripts

build scripts: T3664: move image build scripts to a dedicated directory

build-vyos-image

@@ -1 +1 @@
-scripts/build-vyos-image
+scripts/image-build/build-vyos-image

scripts/image-build/build-vyos-image

@@ -39,8 +39,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

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

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):