5 files changed, 5 insertions, 4 deletions

diff --git a/.gitmodules b/.gitmodules
index c4f27225..23c05b53 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "gen-machine-conf"]
-        path = gen-machine-conf
+        path = meta-xilinx-core/gen-machine-conf
         url = https://gitenterprise.xilinx.com/Petalinux/gen-machine-conf.git
         branch = master
diff --git a/gen-machine-conf b/gen-machine-conf
-Subproject 9d58879b496d0f9bcd26d11658d96a4eaf8c45d
diff --git a/meta-xilinx-core/classes/gen-machine-conf.bbclass b/meta-xilinx-core/classes/gen-machine-conf.bbclass
index d1b46f48..25960cd1 100644
--- a/meta-xilinx-core/classes/gen-machine-conf.bbclass
+++ b/meta-xilinx-core/classes/gen-machine-conf.bbclass
@@ -1,6 +1,6 @@
 #Add scripts path with the tools to PATH to be able to use from eSDK
 sdk_ext_postinst:append() {
-    if [ -d $target_sdk_dir/layers/meta-xilinx/gen-machine-conf ]; then
-        echo "export PATH=$target_sdk_dir/layers/meta-xilinx/gen-machine-conf:\$PATH" >> $env_setup_script
+    if [ -d $target_sdk_dir/layers/meta-xilinx/meta-xilinx-core/gen-machine-conf ]; then
+        echo "export PATH=$target_sdk_dir/layers/meta-xilinx/meta-xilinx-core/gen-machine-conf:\$PATH" >> $env_setup_script
     fi
 }
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index c90b19da..70b0c682 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -75,5 +75,5 @@ XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists
-PLNX_SCRIPTS_PATH = "${LAYERDIR}/../gen-machine-conf/gen-machine-scripts"
+PLNX_SCRIPTS_PATH = "${LAYERDIR}/gen-machine-conf/gen-machine-scripts"
 IMAGE_CLASSES += "gen-machine-conf"
diff --git a/meta-xilinx-core/gen-machine-conf b/meta-xilinx-core/gen-machine-conf
new file mode 160000
+Subproject 9d58879b496d0f9bcd26d11658d96a4eaf8c45d