Skip to content

Commit 750819b

Browse files
committed
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
1 parent f08721e commit 750819b

4 files changed

Lines changed: 8 additions & 6 deletions

File tree

build-vyos-image

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
scripts/build-vyos-image
1+
scripts/image-build/build-vyos-image
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ except ModuleNotFoundError as e:
3939
print(f"Cannot load a required library: {e}")
4040
print("Please make sure the following Python3 modules are installed: tomli jinja2 git")
4141

42-
import vyos_build_utils as utils
43-
import vyos_build_defaults as defaults
42+
# Local modules
43+
import utils
44+
import defaults
4445

4546
# argparse converts hyphens to underscores,
4647
# so for lookups in the original options hash we have to convert them back
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2018 VyOS maintainers and contributors
1+
# Copyright (C) 2024 VyOS maintainers and contributors
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License version 2 or later as
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 VyOS maintainers and contributors
1+
# Copyright (C) 2024 VyOS maintainers and contributors
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License version 2 or later as
@@ -21,7 +21,8 @@
2121
import os
2222
from distutils.spawn import find_executable
2323

24-
import vyos_build_defaults as defaults
24+
# Local modules
25+
import defaults
2526

2627
def check_build_config():
2728
if not os.path.exists(defaults.BUILD_CONFIG):

0 commit comments

Comments
 (0)