vyos/vyos-build
1
0
Fork 0
mirror of https://github.com/vyos/vyos-build.git synced 2025-10-01 20:28:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
build scripts: T3664: move image build scripts to a dedicated directory
This commit is contained in:
John Estabrook 2024-03-23 16:37:43 -05:00 committed by GitHub
commit e765407943
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-vyos-image
View File

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

5
scripts/build-vyos-image → scripts/image-build/build-vyos-image
View File

@ -39,8 +39,9 @@ except ModuleNotFoundError as e:
print(f"Cannot load a required library: {e}") print(f"Cannot load a required library: {e}")
print("Please make sure the following Python3 modules are installed: tomli jinja2 git") print("Please make sure the following Python3 modules are installed: tomli jinja2 git")
import vyos_build_utils as utils # Local modules
import vyos_build_defaults as defaults import utils
import defaults
# argparse converts hyphens to underscores, # argparse converts hyphens to underscores,
# so for lookups in the original options hash we have to convert them back # so for lookups in the original options hash we have to convert them back

2
scripts/vyos_build_defaults.py → scripts/image-build/defaults.py
View File

@ -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 # 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 # it under the terms of the GNU General Public License version 2 or later as

5
scripts/vyos_build_utils.py → scripts/image-build/utils.py
View File

@ -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 # 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 # it under the terms of the GNU General Public License version 2 or later as
@ -21,7 +21,8 @@ import sys
import os import os
from distutils.spawn import find_executable from distutils.spawn import find_executable
import vyos_build_defaults as defaults # Local modules
import defaults
def check_build_config(): def check_build_config():
if not os.path.exists(defaults.BUILD_CONFIG): if not os.path.exists(defaults.BUILD_CONFIG):