From ec42af75e0ab468e062add3852c80254d153c021 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Mon, 22 Apr 2024 15:43:03 +0000 Subject: build: T3664: adjust the vyos-1x submodule path in scripts --- Makefile | 2 +- scripts/image-build/build-vyos-image | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9d8b2d0d..67c2cdc4 100644 --- a/Makefile +++ b/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: diff --git a/scripts/image-build/build-vyos-image b/scripts/image-build/build-vyos-image index 893e0016..f9544054 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) -- cgit v1.2.3