diff options
| author | John Estabrook <jestabro@vyos.io> | 2024-04-22 13:13:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 13:13:43 -0500 |
| commit | c61c8032333f31e589178805c1a335c2dd4d1507 (patch) | |
| tree | eb703a3591594b3b66a1781061eaca56d90089d4 | |
| parent | d9499a16a463aa3fb0d6df791232e13c68f3908a (diff) | |
| parent | ec42af75e0ab468e062add3852c80254d153c021 (diff) | |
| download | vyos-build-c61c8032333f31e589178805c1a335c2dd4d1507.tar.gz vyos-build-c61c8032333f31e589178805c1a335c2dd4d1507.zip | |
Merge pull request #574 from dmbaturin/T3664-submodule-move
build: T3664: move the vyos-1x submodule to packages
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | packages/vyos-1x | 0 | ||||
| -rwxr-xr-x | scripts/image-build/build-vyos-image | 4 | ||||
| m--------- | vyos-1x | 0 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 11906b0d..7d26010c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "vyos-1x"] - path = vyos-1x +[submodule "packages/vyos-1x"] + path = packages/vyos-1x url = https://github.com/vyos/vyos-1x @@ -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/packages/vyos-1x b/packages/vyos-1x new file mode 160000 +Subproject b5d3d36d1f70e53ef6a8a6634ab863d94d791bf 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) diff --git a/vyos-1x b/vyos-1x deleted file mode 160000 -Subproject c55754fd5fe69a44ea33830d60342b894768af5 |