Move gen-machine-conf to meta-xilinx-core

meta-xilinx/gen-machine-conf will not packed into eSDK as its not a layer moving to meta-xilinx-core. Signed-off-by: Raju Kumar Pothuraju <[email protected]> Added a symlink for the gen-machine-conf directory Signed-off-by: Mark Hatle <[email protected]>
Xilinx · Nov 21, 2022 · 072981c · 072981c
1 parent ae7c8cf
commit 072981c
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git 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
diff --git a/gen-machine-conf b/gen-machine-conf
@@ -0,0 +1 @@
+meta-xilinx-core/gen-machine-conf
diff --git 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
@@ -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