From a5fc10cadaeed60b5d0e17ffc6047f164589f029 Mon Sep 17 00:00:00 2001
From: Neena Busireddy <neenareddy.busireddy@nxp.com>
Date: Thu, 7 Dec 2023 10:01:00 -0700
Subject: [PATCH] Include the release layers rename changes [YOCIMX-7393]

Signed-off-by: Neena Busireddy <neenareddy.busireddy@nxp.com>
---
 README                     |  2 +-
 SCR-6.6.3-1.0.0.txt        |  6 +++---
 tools/imx-setup-release.sh | 10 +++++-----
 tools/setup-utils.sh       |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README b/README
index 74009ff1aa..d710ea8c38 100644
--- a/README
+++ b/README
@@ -187,4 +187,4 @@ By default, wayland plugin is enabled.We can switch to kms plugin by following t
 Systemd
 -------
 Systemd support is enabled as default but it can be disabled by commenting out the systemd settings in
-meta-sdk/conf/distro/include/fsl-imx-preferred-env.inc.
+meta-imx-sdk/conf/distro/include/fsl-imx-preferred-env.inc.
diff --git a/SCR-6.6.3-1.0.0.txt b/SCR-6.6.3-1.0.0.txt
index ca43b7e31d..87afbd89c7 100644
--- a/SCR-6.6.3-1.0.0.txt
+++ b/SCR-6.6.3-1.0.0.txt
@@ -1582,7 +1582,7 @@ PATCHES IN META_IMX
 
 Patches for:               systemd
 Source Location:           https://github.com/systemd/systemd-bootchart.git
-Patch Location:            meta-bsp/recipes-core/systemd/systemd
+Patch Location:            meta-imx-bsp/recipes-core/systemd/systemd
 Outgoing License:          GPL-2.0
 License File:              LICENSE.GPL2
 Package Category:          BSP
@@ -1593,7 +1593,7 @@ Origin of patches:         NXP (GPL-2.0)
 
 Patches for:               pulseaudio
 Source Location:           http://freedesktop.org/software/pulseaudio/releases/
-Patch Location:            meta-bsp/recipes-multimedia/pulaeaudio/pulaeaudio
+Patch Location:            meta-imx-bsp/recipes-multimedia/pulaeaudio/pulaeaudio
 Outgoing License:          LGPL-2.1
 License File:              LICENSE
 Package Category:          Multimedia
@@ -1604,7 +1604,7 @@ Origin of patches:         NXP (LGPL-2.1)
 
 Patches for:               vulkan
 Source Location:           git://github.com/vulkan
-Patch Location:            meta-sdk/recipes-graphics/vulkan/
+Patch Location:            meta-imx-sdk/recipes-graphics/vulkan/
 Outgoing License:          MIT
 License File:              LICENSE.md
 Package Category:          Graphics
diff --git a/tools/imx-setup-release.sh b/tools/imx-setup-release.sh
index 4c4f9f693d..14d5945bbf 100755
--- a/tools/imx-setup-release.sh
+++ b/tools/imx-setup-release.sh
@@ -154,14 +154,14 @@ else
 fi
 
 
-META_FSL_BSP_RELEASE="${CWD}/sources/meta-imx/meta-bsp"
+META_FSL_BSP_RELEASE="${CWD}/sources/meta-imx/meta-imx-bsp"
 
 echo "" >> $BUILD_DIR/conf/bblayers.conf
 echo "# i.MX Yocto Project Release layers" >> $BUILD_DIR/conf/bblayers.conf
-hook_in_layer meta-imx/meta-bsp
-hook_in_layer meta-imx/meta-sdk
-hook_in_layer meta-imx/meta-ml
-hook_in_layer meta-imx/meta-v2x
+hook_in_layer meta-imx/meta-imx-bsp
+hook_in_layer meta-imx/meta-imx-sdk
+hook_in_layer meta-imx/meta-imx-ml
+hook_in_layer meta-imx/meta-imx-v2x
 hook_in_layer meta-nxp-demo-experience
 
 echo "" >> $BUILD_DIR/conf/bblayers.conf
diff --git a/tools/setup-utils.sh b/tools/setup-utils.sh
index 9b3204ef4a..de6cc2aaee 100644
--- a/tools/setup-utils.sh
+++ b/tools/setup-utils.sh
@@ -76,7 +76,7 @@ bbclass_overrides() {
 # to the layer folder.
 #
 # Example:
-#   hook_in_layer meta-imx/meta-bsp
+#   hook_in_layer meta-imx/meta-imx-bsp
 hook_in_layer() {
 
     layer=$1