From 131958be21cb8958590432a1a58d2ba0a9efda5f Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Mon, 22 Apr 2024 15:20:16 +0000
Subject: build: T3664: remove the vyos-1x submodule from the root to prepare
 to move it to a subdirectory

---
 .gitmodules | 3 ---
 vyos-1x     | 1 -
 2 files changed, 4 deletions(-)
 delete mode 160000 vyos-1x

diff --git a/.gitmodules b/.gitmodules
index 11906b0d..e69de29b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "vyos-1x"]
-	path = vyos-1x
-	url = https://github.com/vyos/vyos-1x
diff --git a/vyos-1x b/vyos-1x
deleted file mode 160000
index c55754fd..00000000
--- a/vyos-1x
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c55754fd5fe69a44ea33830d60342b894768af58
-- 
cgit v1.2.3


From 425f78ff306d941f645adad763bbdfa68e6a41c2 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
Date: Mon, 22 Apr 2024 15:21:09 +0000
Subject: build: T3664: add vyos-1x repo as packages/vyos-1x submodule

---
 .gitmodules      | 3 +++
 packages/vyos-1x | 1 +
 2 files changed, 4 insertions(+)
 create mode 160000 packages/vyos-1x

diff --git a/.gitmodules b/.gitmodules
index e69de29b..7d26010c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "packages/vyos-1x"]
+	path = packages/vyos-1x
+	url = https://github.com/vyos/vyos-1x
diff --git a/packages/vyos-1x b/packages/vyos-1x
new file mode 160000
index 00000000..b5d3d36d
--- /dev/null
+++ b/packages/vyos-1x
@@ -0,0 +1 @@
+Subproject commit b5d3d36d1f70e53ef6a8a6634ab863d94d791bf2
-- 
cgit v1.2.3


From ec42af75e0ab468e062add3852c80254d153c021 Mon Sep 17 00:00:00 2001
From: Daniil Baturin <daniil@vyos.io>
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