From 750819bfec5335566dfc48de1ab6dbbc869068a3 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Sat, 23 Mar 2024 20:50:36 +0000
Subject: [PATCH] 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

---
 build-vyos-image                                            | 2 +-
 scripts/{ => image-build}/build-vyos-image                  | 5 +++--
 scripts/{vyos_build_defaults.py => image-build/defaults.py} | 2 +-
 scripts/{vyos_build_utils.py => image-build/utils.py}       | 5 +++--
 4 files changed, 8 insertions(+), 6 deletions(-)
 rename scripts/{ => image-build}/build-vyos-image (99%)
 rename scripts/{vyos_build_defaults.py => image-build/defaults.py} (96%)
 rename scripts/{vyos_build_utils.py => image-build/utils.py} (96%)

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
similarity index 99%
rename from scripts/build-vyos-image
rename to scripts/image-build/build-vyos-image
index 3d287406..250a1d2c 100755
--- a/scripts/build-vyos-image
+++ b/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
diff --git a/scripts/vyos_build_defaults.py b/scripts/image-build/defaults.py
similarity index 96%
rename from scripts/vyos_build_defaults.py
rename to 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
similarity index 96%
rename from scripts/vyos_build_utils.py
rename to 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):