diff options
| author | Daniil Baturin <daniil@vyos.io> | 2024-04-22 15:43:03 +0000 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2024-04-22 15:58:34 +0000 |
| commit | ec42af75e0ab468e062add3852c80254d153c021 (patch) | |
| tree | eb703a3591594b3b66a1781061eaca56d90089d4 | |
| parent | 425f78ff306d941f645adad763bbdfa68e6a41c2 (diff) | |
| download | vyos-build-ec42af75e0ab468e062add3852c80254d153c021.tar.gz vyos-build-ec42af75e0ab468e062add3852c80254d153c021.zip | |
build: T3664: adjust the vyos-1x submodule path in scripts
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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: diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 893e001..f954405 100755 --- a/scripts/image-build/build-vyos-image +++ b/scripts/image-build/build-vyos-image @@ -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) |