mirror of
https://github.com/vyos/vyos-build.git
synced 2025-10-01 20:28:40 +02:00
build: T3664: adjust the vyos-1x submodule path in scripts
This commit is contained in:
parent
425f78ff30
commit
ec42af75e0
2
Makefile
2
Makefile
@ -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:
|
||||
|
||||
@ -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)
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user