build: T3664: adjust the vyos-1x submodule path in scripts

This commit is contained in:
Daniil Baturin 2024-04-22 15:43:03 +00:00
parent 425f78ff30
commit ec42af75e0
2 changed files with 3 additions and 3 deletions

View File

@ -8,7 +8,7 @@ all:
@echo "The most common target is 'iso'"
%:
VYOS_TEMPLATE_DIR=`pwd`/vyos-1x/data/templates/ ./build-vyos-image $*
VYOS_TEMPLATE_DIR=`pwd`/packages/vyos-1x/data/templates/ ./build-vyos-image $*
.PHONY: checkiso
.ONESHELL:

View File

@ -66,9 +66,9 @@ except Exception as e:
# Add the vyos-1x submodule directory to the Python path
# so that we can import modules from it.
VYOS1X_DIR = os.path.join(os.getcwd(), 'vyos-1x/python')
VYOS1X_DIR = os.path.join(os.getcwd(), 'packages/vyos-1x/python')
if not os.path.exists(VYOS1X_DIR):
print("E: vyos-1x subdirectory does not exist, did you initialize submodules?")
print("E: vyos-1x subdirectory does not exist, did git submodules fail to initialize?")
else:
sys.path.append(VYOS1X_DIR)