various: Fix variable usage

Remove most direct references to WORKDIR.

S = "${WORKDIR}" is no longer allowed, adjust this to refer to UNPACKDIR

${WORKDIR}/package is also incorrect, adjust to ${PKGD}.

Signed-off-by: Mark Hatle <mark.hatle@amd.com>

180 files changed, 322 insertions, 310 deletions

diff --git a/meta-vitis-tc/recipes-core/meta/meta-xilinx-toolchain.bb b/meta-vitis-tc/recipes-core/meta/meta-xilinx-toolchain.bb
index a276dee7..eaebca44 100644
--- a/meta-vitis-tc/recipes-core/meta/meta-xilinx-toolchain.bb
+++ b/meta-vitis-tc/recipes-core/meta/meta-xilinx-toolchain.bb
@@ -8,6 +8,8 @@ SRC_URI += " \
 "
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
 
+S = "${UNPACKDIR}"
+
 inherit populate_sdk
 
 COMPATIBLE_HOST = "${HOST_SYS}"
@@ -27,7 +29,7 @@ TOOLCHAIN_SHAR_EXT_TMPL = "${VITIS_TC_PATH}/files/toolchain-shar-extract.sh"
 TOOLCHAIN_SHAR_REL_TMPL = "${VITIS_TC_PATH}/files/toolchain-shar-relocate.sh"
 
 create_sdk_files:append () {
-        cp ${WORKDIR}/relocate-wrapper.py ${SDK_OUTPUT}/${SDKPATH}/
+        cp ${S}/relocate-wrapper.py ${SDK_OUTPUT}/${SDKPATH}/
 }
 
 # The wrappers don't do anything, remove them!
diff --git a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
index d4a01048..a09c0768 100644
--- a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
+++ b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
@@ -26,7 +26,7 @@ do_fetch[cleandirs] = "${B}"
 DT_PADDING_SIZE = "0x1000"
 BOOTGEN_FLAGS ?= " -arch ${SOC_FAMILY} -w ${@bb.utils.contains('SOC_FAMILY','zynqmp','','-process_bitstream bin',d)}"
 
-S ?= "${WORKDIR}"
+S ?= "${UNPACKDIR}"
 FW_DIR ?= ""
 DTSI_PATH ?= ""
 DTBO_PATH ?= ""
@@ -52,7 +52,7 @@ python() {
     import re
     soc_family = d.getVar("SOC_FAMILY")
     if "git://" in d.getVar("SRC_URI") or "https://" in d.getVar("SRC_URI"):
-        d.setVar("S",'${WORKDIR}/git/'+d.getVar("FW_DIR"))
+        d.setVar("S",'${UNPACKDIR}/git/'+d.getVar("FW_DIR"))
     else:
         dtsi_found = False
         dtbo_found = False
diff --git a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
index b4de5ee1..71b8b9b8 100644
--- a/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
+++ b/meta-xilinx-core/classes/image-types-xilinx-qemu.bbclass
@@ -39,18 +39,18 @@ CONVERSION_CMD:qemu-sd-fatimg () {
         parted -s ${QEMU_IMG} set 1 boot on
         parted ${QEMU_IMG} print
         BOOT_BLOCKS=$(LC_ALL=C parted -s ${QEMU_IMG} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-        rm -f ${WORKDIR}/${BOOT_VOLUME_ID}.img
-        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${WORKDIR}/${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
+        rm -f ${BOOT_VOLUME_ID}.img
+        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${BOOT_VOLUME_ID}.img $BOOT_BLOCKS
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.bin ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.bin ::/
         fi
         if [ -e ${DEPLOY_DIR_IMAGE}/boot.scr ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${DEPLOY_DIR_IMAGE}/boot.scr ::/
         fi
         if [ ${INITRAMFS_IMAGE} = ${IMAGE_BASENAME} ] && [ x"${INITRAMFS_IMAGE_BUNDLE}" != "x1" ]; then
-                mcopy -i ${WORKDIR}/${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
+                mcopy -i ${BOOT_VOLUME_ID}.img -s  ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type} ::rootfs.cpio.gz.u-boot
         fi
-        dd if=${WORKDIR}/${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
+        dd if=${BOOT_VOLUME_ID}.img of=${QEMU_IMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ALIGNMENT} \* 1024)
 }
 
 CONVERSION_DEPENDS_qemu-sd = "qemu-system-native"
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
index 7d374291..7959d9db 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-# openamp.dtsi is in the WORKDIR
-DT_INCLUDE:append = " ${WORKDIR}"
+# openamp.dtsi is in the UNPACKDIR
+DT_INCLUDE:append = " ${UNPACKDIR}"
 
 do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_DT_INCLUDE_FILES"
 
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
index 7b626ee3..92b0227b 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
@@ -29,7 +29,7 @@ PROVIDES:remove = "virtual/dtb"
 
 DEPENDS += "python3-dtc-native"
 
-S = "${WORKDIR}/source"
+S = "${UNPACKDIR}/source"
 
 # Set a default so something resolves
 SOC_FAMILY ??= "SOC_FAMILY"
@@ -37,12 +37,12 @@ SOC_FAMILY ??= "SOC_FAMILY"
 do_configure:prepend() {
         mkdir -p source
 
-        if [ -e ${WORKDIR}/${MACHINE}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${MACHINE}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${MACHINE}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
-        elif [ -e ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${SOC_FAMILY}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
+        if [ -e ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${MACHINE}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
+        elif [ -e ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
         else
                 bbfatal "${MACHINE}-openamp-overlay.dts or ${SOC_FAMILY}-openamp-overlay.dts file is not available.  Cannot automatically add OpenAMP dtbo file."
         fi
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
index 828a3ca1..7c402e15 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.3.bb
@@ -4,7 +4,7 @@ SUMMARY = "Image update is used to update alternate image on compatible firmware
         Usage: image_update <Input Image File>"
 
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
+LIC_FILES_CHKSUM = "file://LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
 
 BRANCH = "master"
 SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
@@ -12,7 +12,7 @@ SRCREV = "1bd7d7405b484d808176c6e711691a846c18b4f0"
 
 RDEPENDS:${PN} += "freeipmi"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
diff --git a/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb b/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb
index a287d8ce..89a8b5a5 100644
--- a/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb
+++ b/meta-xilinx-core/recipes-apps/raft/raft_2024.1.bb
@@ -1,8 +1,8 @@
 SUMMARY = "RAFT python application"
 LICENSE = "MIT & BSD-3-Clause"
 LIC_FILES_CHKSUM = " \
-    file://${WORKDIR}/git/LICENSE;md5=cc21c526211d34984839aa67dd16f172 \
-    file://${WORKDIR}/git/docs/LICENSE;md5=d8f0ffdbc8d019bc821a5a07bdca1406 \
+    file://LICENSE;md5=cc21c526211d34984839aa67dd16f172 \
+    file://docs/LICENSE;md5=d8f0ffdbc8d019bc821a5a07bdca1406 \
 "
 BRANCH = "2024.1"
 SRC_URI = "git://github.com/Xilinx/RAFT;protocol=https;branch=${BRANCH}"
@@ -10,7 +10,7 @@ SRCREV = "87ea8f4c5ac52fcbc465f41e681fc77aaee9a285"
 
 inherit update-rc.d systemd
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zcu208-zynqmp = "${MACHINE}"
 COMPATIBLE_MACHINE:zcu216-zynqmp = "${MACHINE}"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
index e726ac5b..0b3effe2 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.3.bb
@@ -6,7 +6,7 @@ require aie-rt-2022.inc
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
 inherit features_check
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
index 92f44a34..88d4995f 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.4.bb
@@ -6,7 +6,7 @@ require aie-rt-2023.inc
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
 inherit features_check
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
index 6befcffa..0710a2bb 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.5.bb
@@ -6,7 +6,7 @@ require aie-rt-2024.inc
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
 inherit features_check
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb
index a99f296a..5e825c0a 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/ai-engine-driver_3.6.bb
@@ -6,7 +6,7 @@ require aie-rt-2024.2.inc
 SECTION = "libs"
 
 AIEDIR ?= "${S}/driver"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 I = "${AIEDIR}/include"
 
 IOBACKENDS ?= "Linux"
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
index 5b741f9a..73cbfdd6 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.4.bb
@@ -6,7 +6,7 @@ require aie-rt-2022.inc
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
index 8b5c4334..ab65f319 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.5.bb
@@ -6,7 +6,7 @@ require aie-rt-2023.inc
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
index f8c9482b..11c88d34 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.6.bb
@@ -6,7 +6,7 @@ require aie-rt-2024.inc
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb
index 2e60941b..ef9ff673 100644
--- a/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb
+++ b/meta-xilinx-core/recipes-bsp/ai-engine/aiefal_1.7.bb
@@ -6,7 +6,7 @@ require aie-rt-2024.2.inc
 SECTION = "devel"
 
 XAIEFAL_DIR ?= "fal"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 IOBACKENDS ?= "Linux"
 
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 485d3b17..09f83809 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -9,7 +9,7 @@ inherit deploy
 
 DEPENDS += "u-boot-mkimage-native"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 SYSROOT_DIRS += "/boot"
diff --git a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
index 9fd9c34a..28958c36 100644
--- a/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/base-pdi/base-pdi_1.0.bb
@@ -18,6 +18,8 @@ do_compile[noexec] = "1"
 PDI_PATH ?= ""
 SRC_URI += "${@['file://'+d.getVar('PDI_PATH'),''][d.getVar('PDI_PATH') == '']}"
 
+S = "${UNPACKDIR}"
+
 python() {
     if d.getVar('PDI_SKIP_CHECK') != "1" and not d.getVar('PDI_PATH'):
         raise bb.parse.SkipRecipe("PDI_PATH is not configured with the base design pdi")
@@ -27,9 +29,9 @@ python() {
 #will need to bbappend to this in meta-xilinx-tools to use xsct to extract pdi from xsa and install
 do_install() {
 
-    if [ -f ${WORKDIR}/${PDI_PATH} ];then
+    if [ -f ${S}/${PDI_PATH} ];then
         install -d ${D}/boot
-        install -m 0644 ${WORKDIR}/${PDI_PATH} ${D}/boot/base-design.pdi
+        install -m 0644 ${S}/${PDI_PATH} ${D}/boot/base-design.pdi
     else
         bbfatal "No base pdi supplied"
     fi
diff --git a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
index b9236f55..86225181 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-bootbin_1.0.bb
@@ -178,10 +178,10 @@ do_configure[vardeps] += "BIF_PARTITION_ATTR BIF_PARTITION_IMAGE BIF_COMMON_ATTR
 do_configure[vardeps] += "BIF_FSBL_ATTR BIF_BITSTREAM_ATTR BIF_ATF_ATTR BIF_DEVICETREE_ATTR BIF_SSBL_ATTR"
 
 do_compile() {
-    cd ${WORKDIR}
+    cd ${UNPACKDIR}
     rm -f ${B}/BOOT.bin
     if [ "${BIF_FILE_PATH}" != "${B}/bootgen.bif" ];then
-        BIF_FILE_PATH="${WORKDIR}${BIF_FILE_PATH}"
+        BIF_FILE_PATH="${UNPACKDIR}${BIF_FILE_PATH}"
     fi
     bootgen -image ${BIF_FILE_PATH} -arch ${BOOTGEN_ARCH} ${BOOTGEN_EXTRA_ARGS} -w -o ${B}/BOOT.bin
     if [ ! -e ${B}/BOOT.bin ]; then
diff --git a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
index fbe85f96..0fc20298 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -74,8 +74,8 @@ do_configure:prepend () {
     fi
 
     for f in ${EXTRA_DT_FILES} ${EXTRA_DT_INCLUDE_FILES}; do
-        if [ "$(realpath ${WORKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
-            cp ${WORKDIR}/${f} ${DT_FILES_PATH}/
+        if [ "$(realpath ${UNPACKDIR}/${f})" != "$(realpath ${DT_FILES_PATH}/`basename ${f}`)" ]; then
+            cp ${UNPACKDIR}/${f} ${DT_FILES_PATH}/
         fi
     done
 }
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
index 386e1b79..9e0f07ac 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_1.0.bb
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
index f25201bd..2699a55d 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.1.bb
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
index b55ce8c0..da2f3e26 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2023.2.bb
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
index c646228d..261156f9 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.1.bb
@@ -19,7 +19,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
index 88dec7b8..8f634398 100644
--- a/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
+++ b/meta-xilinx-core/recipes-bsp/dfx-mgr/dfx-mgr_2024.2.bb
@@ -20,7 +20,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake update-rc.d systemd
 
diff --git a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
index b9a36d77..f7eaa111 100644
--- a/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/fpga-manager-script/fpga-manager-script_1.0.bb
@@ -1,12 +1,12 @@
 SUMMARY = "Install user script to support fpga-manager"
 DESCRIPTION = "Install user script that loads and unloads overlays using kernel fpga-manager"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/fpgautil.c;beginline=1;endline=24;md5=0dbf04c2c1026b3d120136e728b7a09f"
+LIC_FILES_CHKSUM = "file://fpgautil.c;beginline=1;endline=24;md5=0dbf04c2c1026b3d120136e728b7a09f"
 
 SRC_URI = "\
         file://fpgautil.c \
         "
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
index 1bd468d7..7727b93d 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
index 15c04add..e64687f5 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
index 70d85f88..06d991df 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
index c82984f4..9eea4fbe 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 COMPATIBLE_MACHINE:versal-net = "versal-net"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
index 3a097b24..fcea2da7 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.2.bb
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit cmake
 
diff --git a/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
index 75c83ee8..a9c10d47 100644
--- a/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
+++ b/meta-xilinx-core/recipes-bsp/platform-init/platform-init.bb
@@ -18,7 +18,7 @@ PROVIDES += "virtual/xilinx-platform-init"
 
 SRC_URI = "${@" ".join(["file://%s" % f for f in (d.getVar('PLATFORM_INIT_FILES') or "").split()])}"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 SYSROOT_DIRS += "${PLATFORM_INIT_DIR}"
 
diff --git a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
index 44ad9368..2d36b4a8 100644
--- a/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
+++ b/meta-xilinx-core/recipes-bsp/pmu-firmware/pmu-rom-native.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://PMU_ROM-LICENSE.txt;md5=d43d49bc1eb1c907fc6f4ea75abaf
 SRC_URI = "https://www.xilinx.com/bin/public/openDownload?filename=PMU_ROM.tar.gz"
 SRC_URI[sha256sum] = "f9a450ef960979463ea0a87a35fafb4a5b62d3a741de30cbcef04c8edc22a7cf"
 
-S = "${WORKDIR}/PMU_ROM"
+S = "${UNPACKDIR}/PMU_ROM"
 
 inherit deploy native
 
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
index 86ba82bb..3c8d1ed6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc
@@ -19,5 +19,5 @@ SRC_URI:append:microblaze = " file://microblaze-generic-top.h"
 FILESEXTRAPATHS:prepend := "${THISDIR}/u-boot-v2023.01:"
 
 do_configure:prepend:microblaze () {
-    install ${WORKDIR}/microblaze-generic-top.h ${S}/include/configs/
+    install ${UNPACKDIR}/microblaze-generic-top.h ${S}/include/configs/
 }
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
index 765af276..387367c6 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-common.inc
@@ -6,7 +6,7 @@ UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) !
 
 SRC_URI = "${UBOOTURI};${UBRANCHARG}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 UBOOT_MB_INC = ""
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index e13413a1..a8dfa57e 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 
 DEPENDS = "u-boot-mkimage-native"
 
+S = "${UNPACKDIR}"
+
 inherit deploy image-wic-utils
 
 INHIBIT_DEFAULT_DEPS = "1"
@@ -268,14 +270,14 @@ do_compile() {
         -e 's:@@KERNEL_ROOT_RAMDISK@@:${KERNEL_ROOT_RAMDISK}:' \
         -e 's:@@KERNEL_COMMAND_APPEND@@:${KERNEL_COMMAND_APPEND}:' \
         ${SCRIPT_SED_ADDENDUM} \
-        "${WORKDIR}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > "${WORKDIR}/boot.cmd"
+        "${S}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > boot.cmd
 
-    mkimage -A arm -T script -C none -n "Boot script" -d "${WORKDIR}/boot.cmd" boot.scr
+    mkimage -A arm -T script -C none -n "Boot script" -d boot.cmd boot.scr
 
     sed -e 's/@@KERNEL_IMAGETYPE@@/${KERNEL_IMAGETYPE}/' \
         -e 's/@@DEVICE_TREE_NAME@@/${DEVICE_TREE_NAME}/' \
         -e 's/@@RAMDISK_IMAGE@@/${PXERAMDISK_IMAGE}/' \
-        "${WORKDIR}/pxeboot.pxe" > "pxeboot.pxe"
+        "${S}/pxeboot.pxe" > "pxeboot.pxe"
 }
 
 do_install() {
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
index dafaab25..53355f28 100644
--- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
+++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-uenv.bb
@@ -94,7 +94,7 @@ DEVICETREE_OVERLAY_LOAD_ADDRESS:zynqmp = "${@hex(int(d.getVar("DEVICETREE_LOAD_A
 
 python do_compile() {
     env = uenv_populate(d)
-    with open(d.expand("${WORKDIR}/uEnv.txt"), "w") as f:
+    with open(d.expand("uEnv.txt"), "w") as f:
         for k, v in env.items():
             f.write("{0}={1}\n".format(k, v))
 }
@@ -102,11 +102,11 @@ python do_compile() {
 FILES:${PN} += "/boot/uEnv.txt"
 
 do_install() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${D}/boot/uEnv.txt
+        install -Dm 0644 uEnv.txt ${D}/boot/uEnv.txt
 }
 
 do_deploy() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv.txt
+        install -Dm 0644 uEnv.txt ${DEPLOYDIR}/uEnv.txt
 }
 addtask do_deploy after do_compile before do_build
 
diff --git a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
index ba6d829d..0a929ca9 100644
--- a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.2.bb
@@ -4,7 +4,7 @@ DESCRIPTION = "Building and installing bootgen, a Xilinx tool that lets you stit
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=d526b6d0807bf263b97da1da876f39b1"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 DEPENDS += "openssl"
 RDEPENDS:${PN} += "openssl"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
index 8bd6e6bc..20210be9 100644
--- a/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
+++ b/meta-xilinx-core/recipes-devtools/python/python3-anytree_2.8.0.bb
@@ -10,7 +10,7 @@ DEPENDS += "python3-six"
 SRC_URI = "git://github.com/c0fec0de/anytree.git;branch=2.x.x;protocol=https"
 SRCREV = "75c0198636f8997967ba00df5077cd21350f68ce"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit setuptools3
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
index e1dcc5ae..9f08a1f4 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
@@ -4,6 +4,7 @@ DESCRIPTION = "Building and installing flash strip utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../flash_stripe.c;beginline=1;endline=23;md5=abb859d98b7c4eede655e1b71824125a"
 
+S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"
 
 SRC_URI += "file://flash_stripe.c"
@@ -11,10 +12,10 @@ SRC_URI += "file://flash_stripe.c"
 TARGET_CC_ARCH += "${LDFLAGS}"
 
 do_compile() {
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
-    ${CC} ${WORKDIR}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
+    ${CC} ${S}/flash_stripe.c -o flash_strip
+    ${CC} ${S}/flash_stripe.c -o flash_unstrip
+    ${CC} ${S}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
+    ${CC} ${S}/flash_stripe.c -o flash_unstrip_bw -DUNSTRIP -DFLASH_STRIPE_BW
 }
 
 do_install() {
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
index 5154e247..29b12354 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -148,11 +148,11 @@ do_install () {
         # If we built the guest agent, also install startup/udev rules
         if [ -e "${D}${bindir}/qemu-ga" ]; then
                 install -d ${D}${sysconfdir}/init.d/
-                install -m 0755 ${WORKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent
+                install -m 0755 ${UNPACKDIR}/qemu-guest-agent.init ${D}${sysconfdir}/init.d/qemu-guest-agent
                 sed -i 's:@bindir@:${bindir}:' ${D}${sysconfdir}/init.d/qemu-guest-agent
 
                 install -d ${D}${sysconfdir}/udev/rules.d/
-                install -m 0644 ${WORKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules
+                install -m 0644 ${UNPACKDIR}/qemu-guest-agent.udev ${D}${sysconfdir}/udev/rules.d/60-qemu-guest-agent.rules
 
                 install -d ${D}${systemd_unitdir}/system/
                 install -m 0644 ${S}/contrib/systemd/qemu-guest-agent.service ${D}${systemd_unitdir}/system
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
index 26327ba3..5f180a35 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -17,7 +17,7 @@ SRC_URI = "${REPO};${BRANCHARG}"
 SRC_URI += "file://0001-versal-Reorder-serial-ports.patch"
 SRC_URI += "file://0001-versal-net-Reorder-serial-port.patch"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 do_install[noexec] = '1'
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
index da62c8b7..5416f128 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-8.1.inc
@@ -79,7 +79,7 @@ SRC_URI += "\
            "
 
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # Based on qemu settings in poky/meta/conf/distro/include/no-static-libs.inc
 DISABLE_STATIC:pn-qemu-xilinx = ""
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index 1eec0163..52c0da6a 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
@@ -15,6 +15,6 @@ do_compile[noexec] = "1"
 SYSROOT_DIRS += "${bindir}/qemu-xilinx"
 
 do_install() {
-        install -Dm 0755 ${WORKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-system-aarch64-multiarch
+        install -Dm 0755 ${UNPACKDIR}/qemu-system-aarch64-multiarch ${D}${bindir}/qemu-system-aarch64-multiarch
 }
 
diff --git a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
index 4a801810..1e626ffe 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-system-native_8.1.0.bb
@@ -20,7 +20,7 @@ PACKAGECONFIG ??= "fdt alsa kvm pie slirp png gcrypt \
 PACKAGECONFIG:remove = "${@'kvm' if not os.path.exists('/usr/include/linux/kvm.h') else ''}"
 
 do_install:append() {
-    install -Dm 0755 ${WORKDIR}/powerpc_rom.bin ${D}${datadir}/qemu-xilinx
+    install -Dm 0755 ${UNPACKDIR}/powerpc_rom.bin ${D}${datadir}/qemu-xilinx
 
     # The following is also installed by qemu-native
     rm -f ${D}${datadir}/qemu-xilinx/trace-events-all
diff --git a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index ebf7cd9e..9431a7be 100644
--- a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -8,10 +8,10 @@ SRC_URI += " \
 
 do_install:append() {
     install -d ${D}${bindir}
-    install -m 0755 ${WORKDIR}/monitor-hotplug.sh ${D}${bindir}
+    install -m 0755 ${UNPACKDIR}/monitor-hotplug.sh ${D}${bindir}
 
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-monitor-hotplug.rules ${D}${sysconfdir}/udev/rules.d/99-monitor-hotplug.rules
+    install -m 0644 ${UNPACKDIR}/99-monitor-hotplug.rules ${D}${sysconfdir}/udev/rules.d/99-monitor-hotplug.rules
 }
 
 FILES:${PN} += "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
index 3aaac030..083604dd 100644
--- a/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
+++ b/meta-xilinx-core/recipes-kernel/dp/kernel-module-dp_6.6.10.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO   ?= "git://github.com/xilinx/dp-modules.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
index d6b4d565..a56f90b0 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.40.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=b34277fe156508fd5a650609dc36d1fe"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 BRANCH ?= "xlnx_rel_v2024.2"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb b/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb
index 806d2515..9a266e9c 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi21/kernel-module-hdmi21_2024.2.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/Xilinx/hdmi21-modules.git;protocol=https;branch=${SR
 
 SRCREV = "26a1d40723c58783f7aedba028a208ab9410df5f"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
diff --git a/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
index 97740671..76002cb3 100644
--- a/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
+++ b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb
@@ -14,7 +14,7 @@ NO_GENERIC_LICENSE[Firmware-ti-bt] = "LICENSE.ti-bt"
 SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;protocol=https;branch=master"
 SRCREV = "c290f8af9e388f37e509ecb111a1b64572b7c225"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit allarch
 
diff --git a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb b/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
index 966aaaf5..8eb742c9 100644
--- a/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
+++ b/meta-xilinx-core/recipes-kernel/linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb
@@ -7,7 +7,7 @@ SRC_URI = "\
     file://99-aie-device.rules \
 "
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 inherit useradd
 
@@ -23,7 +23,7 @@ do_compile[noexec] = '1'
 
 do_install () {
     install -d ${D}${sysconfdir}/udev/rules.d
-    for rule in $(find ${WORKDIR} -maxdepth 1 -type f -name "*.rules"); do
+    for rule in $(find ${UNPACKDIR} -maxdepth 1 -type f -name "*.rules"); do
         install -m 0644 $rule ${D}${sysconfdir}/udev/rules.d/
     done
 }
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
index 329ae03b..3133c485 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx.inc
@@ -27,14 +27,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
 
 EXTKERNELSRC = "${@'1' if d.getVar('EXTERNALSRC') else ''}"
 
-# Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${WORKDIR}
+# Force the use of the KBUILD_DEFCONFIG even if some other defconfig was generated in the ${UNPACKDIR}
 do_kernel_metadata:prepend () {
-        [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${WORKDIR}/defconfig ] && rm ${WORKDIR}/defconfig
+        [ -n "${KBUILD_DEFCONFIG}" ] && [ -e ${UNPACKDIR}/defconfig ] && rm ${UNPACKDIR}/defconfig
 }
 
 do_configure:prepend () {
         if [ -n "${KBUILD_DEFCONFIG}" ] && [ -n "${EXTKERNELSRC}" ]; then
-                cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${WORKDIR}/defconfig
+                cp ${S}/arch/${ARCH}/configs/${KBUILD_DEFCONFIG} ${UNPACKDIR}/defconfig
         fi
 }
 
diff --git a/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
index 2648c372..c44e8ab1 100644
--- a/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
@@ -13,7 +13,7 @@ SRC_URI = " \
 
 LIC_FILES_CHKSUM = "file://lop-microblaze-yocto.dts;endline=10;md5=27139f9b862dc6fe466c7157aba7ed9c"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 inherit python3-dir
 
diff --git a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
index 0da7b6f6..5ac2f4a6 100644
--- a/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
+++ b/meta-xilinx-core/recipes-support/freeipmi/freeipmi_1.6.10.bb
@@ -34,7 +34,7 @@ SRC_URI = " \
         "
 SRCREV ?= "816a69eb15a9034351381211d9cd15de81da10c7"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit autotools-brokensep pkgconfig systemd
 
diff --git a/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
index f3e920c2..d7d2cb6c 100644
--- a/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
+++ b/meta-xilinx-core/recipes-support/libgpg-error/libgpg-error_%.bbappend
@@ -3,6 +3,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI:append:microblaze = " file://lock-obj-pub.microblazeel-unknown-linux-gnu.h"
 
 do_configure:append:microblaze () {
-        cp ${WORKDIR}/lock-obj-pub.microblazeel-unknown-linux-gnu.h ${S}/src/syscfg/
+        cp ${UNPACKDIR}/lock-obj-pub.microblazeel-unknown-linux-gnu.h ${S}/src/syscfg/
 }
 
diff --git a/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb b/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
index f3b53c25..cf0c778d 100644
--- a/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
+++ b/meta-xilinx-core/recipes-utils/mb-realoc/mb-realoc.bb
@@ -14,7 +14,8 @@ ELF_LOAD_ADDR ?= "0"
 ELF_JUMP_OFFSET ?= ""
 ELF_INFILE ?= "${DEPLOY_DIR_IMAGE}/u-boot.elf"
 OUTFILE_NAME ?= "u-boot-s"
-B = "${WORKDIR}"
+S = "${UNPACKDIR}"
+B = "${WORKDIR}/build"
 
 PARALLEL_MAKE=""
 
@@ -23,14 +24,14 @@ do_compile[depends] = "virtual/bootloader:do_deploy"
 
 do_compile() {
         export CROSS_COMPILE="${TARGET_PREFIX}"
-        ${WORKDIR}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME}
+        ${S}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME}
 }
 
 do_install[noexec] = "1"
 
 do_deploy() {
         install -d ${DEPLOYDIR}
-        install -m 0644 ${WORKDIR}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin
+        install -m 0644 ${B}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin
 }
 
 addtask deploy after do_compile
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
index 6cf10817..c203aa10 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
     file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
 "
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig native
 
@@ -25,5 +25,5 @@ EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
 
 do_install() {
     install -d ${D}${bindir}
-    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+    install -Dm 0755 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
 }
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb
index 37f32a23..a5fa0fa9 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.319.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
     file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
 "
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig native
 
@@ -25,5 +25,5 @@ EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
 
 do_install() {
     install -d ${D}${bindir}
-    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+    install -Dm 0755 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
 }
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb
index 6e280009..191de878 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202420.2.18.0.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = " \
     file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \
 "
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig native
 
@@ -25,5 +25,5 @@ EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON"
 
 do_install() {
     install -d ${D}${bindir}
-    install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
+    install -Dm 0755 ${B}/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
 }
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
index 0e9dd3db..49cfa228 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202210.2.13.479.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                     file://runtime_src/core/pcie/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 \
                     file://runtime_src/core/edge/tools/xbutil/LICENSE;md5=d273d63619c9aeaf15cdaf76422c4f87 "
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
index 7107c3df..f686a746 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202220.2.14.0.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=da5408f748bce8a9851dac18e66f4bcf \
                     file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
                     file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 "
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
index 0ee4d137..8a78d2f9 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202310.2.15.0.bb
@@ -17,7 +17,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
index 946b6551..abb0190d 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202320.2.16.0.bb
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
index ff058db3..c88450c2 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.319.bb
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
index d538f947..d9a44019 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202420.2.18.0.bb
@@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \
 COMPATIBLE_HOST = "^$"
 COMPATIBLE_HOST:aarch64 = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
index 7063178a..464b96fd 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202210.2.13.479.bb
@@ -11,7 +11,7 @@ LICENSE = "GPLv2 & Apache-2.0"
 # Patch is applied as -p 4 to the src/runtime_src/core/edge directory
 SRC_URI += "file://0001-Fixed-ZOCL-dtbo-path-len-issue-6966.patch;striplevel=5;patchdir=./../../"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
index 39e9f9fb..7643b42a 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202220.2.14.0.bb
@@ -8,7 +8,7 @@ require recipes-xrt/xrt/xrt-${PV}.inc
 LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8"
 LICENSE = "GPL-2.0-or-later & Apache-2.0"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
index 47efc58a..998ff99c 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202310.2.15.0.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
index 47efc58a..998ff99c 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202320.2.16.0.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
index 47efc58a..998ff99c 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202410.2.17.319.bb
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
index e5efd89c..9a1e3574 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/zocl_202420.2.18.0.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 COMPATIBLE_MACHINE:versal-net = ".*"
 
-S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl"
+S = "${UNPACKDIR}/git/src/runtime_src/core/edge/drm/zocl"
 
 inherit module
 
diff --git a/meta-xilinx-demos/classes/jupyter-examples.bbclass b/meta-xilinx-demos/classes/jupyter-examples.bbclass
index 962f45b2..55ab934b 100644
--- a/meta-xilinx-demos/classes/jupyter-examples.bbclass
+++ b/meta-xilinx-demos/classes/jupyter-examples.bbclass
@@ -1,4 +1,4 @@
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} += "${JUPYTER_DIR}"
 
diff --git a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-example/pm-notebooks/pm-notebooks_1.0.bb b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-example/pm-notebooks/pm-notebooks_1.0.bb
index 2c00c316..f8591b82 100644
--- a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-example/pm-notebooks/pm-notebooks_1.0.bb
+++ b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-example/pm-notebooks/pm-notebooks_1.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/Xilinx/platform-management-notebooks.git;branch=xlnx
 
 SRCREV = "c502be361b6857e21ab903f31c9ead69e3a0d9ba"
 
-S = "${WORKDIR}/git/pm-notebooks"
+S = "${UNPACKDIR}/git/pm-notebooks"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal = "versal"
diff --git a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyterlab/start-jupyterlab_1.0.bb b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyterlab/start-jupyterlab_1.0.bb
index 240e8267..999aa11b 100644
--- a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyterlab/start-jupyterlab_1.0.bb
+++ b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyterlab/start-jupyterlab_1.0.bb
@@ -35,28 +35,28 @@ SYSTEMD_PACKAGES="${PN}"
 SYSTEMD_SERVICE:${PN}="jupyter-setup.service"
 SYSTEMD_AUTO_ENABLE:${PN}="disable"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 do_install() {
     install -d ${D}${datadir}/jupyter/lab/settings
-    install -m 0644 ${WORKDIR}/overrides.json ${D}${datadir}/jupyter/lab/settings/
+    install -m 0644 ${S}/overrides.json ${D}${datadir}/jupyter/lab/settings/
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
        install -d ${D}${sysconfdir}/init.d/
-       install -m 0755 ${WORKDIR}/jupyter-setup.sh ${D}${sysconfdir}/init.d/jupyter-setup.sh
+       install -m 0755 ${S}/jupyter-setup.sh ${D}${sysconfdir}/init.d/jupyter-setup.sh
     fi
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/jupyter-setup.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${S}/jupyter-setup.service ${D}${systemd_system_unitdir}
 
     install -d ${D}${systemd_user_unitdir}
-    install -m 0644 ${WORKDIR}/jupyter-setup.service ${D}${systemd_user_unitdir}
+    install -m 0644 ${S}/jupyter-setup.service ${D}${systemd_user_unitdir}
 
     install -d ${D}${base_sbindir}
-    install -m 0755 ${WORKDIR}/start-jupyter.sh ${D}${base_sbindir}/start-jupyter.sh
+    install -m 0755 ${S}/start-jupyter.sh ${D}${base_sbindir}/start-jupyter.sh
 
     install -d ${D}${sysconfdir}/jupyter/
-    install -m 0644 ${WORKDIR}/jupyter_server_config.py ${D}${sysconfdir}/jupyter
+    install -m 0644 ${S}/jupyter_server_config.py ${D}${sysconfdir}/jupyter
 }
 
 FILES:${PN} += " \
diff --git a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyternb/start-jupyternb_1.0.bb b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyternb/start-jupyternb_1.0.bb
index 42cae9c5..ca2ad88d 100644
--- a/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyternb/start-jupyternb_1.0.bb
+++ b/meta-xilinx-demos/dynamic-layers/meta-jupyter/recipes-utils/start-jupyternb/start-jupyternb_1.0.bb
@@ -27,7 +27,7 @@ SYSTEMD_PACKAGES="${PN}"
 SYSTEMD_SERVICE:${PN}="jupyter-setup.service"
 SYSTEMD_AUTO_ENABLE:${PN}="disable"
 
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 
 FILES:${PN} += "${base_sbindir} ${systemd_user_unitdir} ${datadir}"
 
@@ -35,20 +35,20 @@ do_install() {
 
     if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
        install -d ${D}${sysconfdir}/init.d/
-       install -m 0755 ${WORKDIR}/jupyter-setup.sh ${D}${sysconfdir}/init.d/jupyter-setup.sh
+       install -m 0755 ${S}/jupyter-setup.sh ${D}${sysconfdir}/init.d/jupyter-setup.sh
     fi
 
     install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${WORKDIR}/jupyter-setup.service ${D}${systemd_system_unitdir}
+    install -m 0644 ${S}/jupyter-setup.service ${D}${systemd_system_unitdir}
 
     install -d ${D}${systemd_user_unitdir}
-    install -m 0644 ${WORKDIR}/jupyter-setup.service ${D}${systemd_user_unitdir}
+    install -m 0644 ${S}/jupyter-setup.service ${D}${systemd_user_unitdir}
 
     install -d ${D}${base_sbindir}
-    install -m 0755 ${WORKDIR}/start-jupyter.sh ${D}${base_sbindir}/start-jupyter.sh
+    install -m 0755 ${S}/start-jupyter.sh ${D}${base_sbindir}/start-jupyter.sh
 
     install -d ${D}${sysconfdir}/jupyter/
-    install -m 0644 ${WORKDIR}/jupyter_notebook_config.py ${D}${sysconfdir}/jupyter
+    install -m 0644 ${S}/jupyter_notebook_config.py ${D}${sysconfdir}/jupyter
 
     install -d ${D}${datadir}/example-notebooks
 }
diff --git a/meta-xilinx-demos/dynamic-layers/meta-openamp/recipes-example/openamp/openamp-demo-notebooks_0.1.bb b/meta-xilinx-demos/dynamic-layers/meta-openamp/recipes-example/openamp/openamp-demo-notebooks_0.1.bb
index 4c4ff2d8..1d823128 100644
--- a/meta-xilinx-demos/dynamic-layers/meta-openamp/recipes-example/openamp/openamp-demo-notebooks_0.1.bb
+++ b/meta-xilinx-demos/dynamic-layers/meta-openamp/recipes-example/openamp/openamp-demo-notebooks_0.1.bb
@@ -10,7 +10,7 @@ BRANCH ?= "main"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH') != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 PV .= "+git"
-S = "${WORKDIR}/git/openamp"
+S = "${UNPACKDIR}/git/openamp"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
diff --git a/meta-xilinx-demos/recipes-apps/sdfec/sdfec_1.1.bb b/meta-xilinx-demos/recipes-apps/sdfec/sdfec_1.1.bb
index ac8303aa..871b2e56 100644
--- a/meta-xilinx-demos/recipes-apps/sdfec/sdfec_1.1.bb
+++ b/meta-xilinx-demos/recipes-apps/sdfec/sdfec_1.1.bb
@@ -16,7 +16,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git/sd-fec-1.1"
+S = "${UNPACKDIR}/git/sd-fec-1.1"
 
 DEPENDS += "libgpiod"
 
diff --git a/meta-xilinx-demos/recipes-examples/gpio-demo/gpio-demo.bb b/meta-xilinx-demos/recipes-examples/gpio-demo/gpio-demo.bb
index 912e0cd4..c19870ac 100644
--- a/meta-xilinx-demos/recipes-examples/gpio-demo/gpio-demo.bb
+++ b/meta-xilinx-demos/recipes-examples/gpio-demo/gpio-demo.bb
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
 SRC_URI = "file://gpio-demo.c \
            file://Makefile \
         "
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 CFLAGS:prepend = "-I ${S}/include"
 do_compile() {
         oe_runmake
diff --git a/meta-xilinx-demos/recipes-examples/peekpoke/peekpoke.bb b/meta-xilinx-demos/recipes-examples/peekpoke/peekpoke.bb
index 3949598e..31ed475d 100644
--- a/meta-xilinx-demos/recipes-examples/peekpoke/peekpoke.bb
+++ b/meta-xilinx-demos/recipes-examples/peekpoke/peekpoke.bb
@@ -11,7 +11,7 @@ SRC_URI = "file://peek.c \
            file://poke.c \
            file://Makefile \
           "
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
 CFLAGS:prepend = "-I ${S}/include"
 do_compile() {
         oe_runmake
diff --git a/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb b/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
index 045b88d5..7af72e4d 100644
--- a/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
+++ b/meta-xilinx-demos/recipes-firmware/vek280-pl-bram-uart-gpio-fw/vek280-pl-bram-uart-gpio-fw_1.0-2024.2.bb
@@ -23,7 +23,7 @@ FW_DIR = "vek280-pl-bram-gpio-fw"
 do_configure[prefuncs] =+ "copy_fw_files"
 python copy_fw_files () {
     import shutil
-    fw_file_src = d.getVar('WORKDIR') + '/' + d.getVar("FW_DIR")
+    fw_file_src = d.getVar('UNPACKDIR') + '/' + d.getVar("FW_DIR")
     fw_file_dest = d.getVar('S')
     shutil.copytree(fw_file_src, fw_file_dest, dirs_exist_ok=True)
 }
diff --git a/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb b/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
index 0dcb2be2..326689fd 100644
--- a/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
+++ b/meta-xilinx-demos/recipes-firmware/zcu104-pl-vcu-fw/zcu104-pl-vcu-fw_1.0-2024.2.bb
@@ -23,7 +23,7 @@ FW_DIR = "zcu104-pl-vcu-fw"
 do_configure[prefuncs] =+ "copy_fw_files"
 python copy_fw_files () {
     import shutil
-    fw_file_src = d.getVar('WORKDIR') + '/' + d.getVar("FW_DIR")
+    fw_file_src = d.getVar('UNPACKDIR') + '/' + d.getVar("FW_DIR")
     fw_file_dest = d.getVar('S')
     shutil.copytree(fw_file_src, fw_file_dest, dirs_exist_ok=True)
 }
diff --git a/meta-xilinx-mali400/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb b/meta-xilinx-mali400/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
index b0fe3c79..0ad7aa42 100644
--- a/meta-xilinx-mali400/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
+++ b/meta-xilinx-mali400/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
@@ -28,7 +28,7 @@ SRC_URI = " \
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # If were switching at runtime, we would need all RDEPENDS needed for all backends available
 X11RDEPENDS = "libxdamage libxext libx11 libdrm libxfixes"
@@ -77,10 +77,10 @@ do_install() {
     install -m 0644 ${S}/${PV}/glesHeaders/KHR/*.h ${D}${includedir}/KHR/
 
     install -d ${D}${libdir}/pkgconfig
-    install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
-    install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
-    install -m 0644 ${WORKDIR}/glesv1.pc ${D}${libdir}/pkgconfig/glesv1.pc
-    install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+    install -m 0644 ${UNPACKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
+    install -m 0644 ${UNPACKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
+    install -m 0644 ${UNPACKDIR}/glesv1.pc ${D}${libdir}/pkgconfig/glesv1.pc
+    install -m 0644 ${UNPACKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
 
     install -d ${D}${libdir}
     install -d ${D}${includedir}
@@ -93,7 +93,7 @@ do_install() {
 
     # install gbm
     install -m 0644 ${S}/${PV}/glesHeaders/GBM/gbm.h ${D}${includedir}/
-    install -m 0644 ${WORKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
+    install -m 0644 ${UNPACKDIR}/gbm.pc ${D}${libdir}/pkgconfig/gbm.pc
 
     if [ "${USE_FB}" = "yes" ]; then
         install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/fbdev/${MONOLITHIC_LIBMALI} ${D}${libdir}/fbdev/${MONOLITHIC_LIBMALI}
diff --git a/meta-xilinx-mali400/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb b/meta-xilinx-mali400/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
index c25970e7..12b117d4 100644
--- a/meta-xilinx-mali400/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
+++ b/meta-xilinx-mali400/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
@@ -42,7 +42,7 @@ inherit features_check module
 
 PARALLEL_MAKE = "-j 1"
 
-S = "${WORKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
+S = "${UNPACKDIR}/DX910-SW-99002-${PV}/driver/src/devicedrv/mali"
 
 REQUIRED_MACHINE_FEATURES = "mali400"
 
diff --git a/meta-xilinx-mali400/recipes-graphics/wayland/weston_9.0.0.bb b/meta-xilinx-mali400/recipes-graphics/wayland/weston_9.0.0.bb
index a534b1b7..af329e30 100644
--- a/meta-xilinx-mali400/recipes-graphics/wayland/weston_9.0.0.bb
+++ b/meta-xilinx-mali400/recipes-graphics/wayland/weston_9.0.0.bb
@@ -107,18 +107,18 @@ do_install:append() {
         # If X11, ship a desktop file to launch it
         if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then
                 install -d ${D}${datadir}/applications
-                install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
+                install ${UNPACKDIR}/weston.desktop ${D}${datadir}/applications
 
                 install -d ${D}${datadir}/icons/hicolor/48x48/apps
-                install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
+                install ${UNPACKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
+                install -Dm 644 ${UNPACKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then
-                install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
+                install -Dm 644 ${UNPACKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify
         fi
 
         if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then
diff --git a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-examples_0.1.bb b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-examples_0.1.bb
index 3741c4d4..4729c0aa 100644
--- a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-examples_0.1.bb
+++ b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-examples_0.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=17e31b2e971eed6471a361c7dc4faa18"
 
 require gstreamer-multimedia-notebooks_0.1.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-notebooks_0.1.bb b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-notebooks_0.1.bb
index 2d39f34e..05841db9 100644
--- a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-notebooks_0.1.bb
+++ b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vcu-notebooks_0.1.bb
@@ -6,7 +6,7 @@ inherit jupyter-examples
 
 require gstreamer-multimedia-notebooks_0.1.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-examples_0.1.bb b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-examples_0.1.bb
index 8469412e..4100f488 100644
--- a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-examples_0.1.bb
+++ b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-examples_0.1.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=17e31b2e971eed6471a361c7dc4faa18"
 
 require gstreamer-multimedia-notebooks_0.1.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-notebooks_0.1.bb b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-notebooks_0.1.bb
index 28bbca90..da33dbb9 100644
--- a/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-notebooks_0.1.bb
+++ b/meta-xilinx-multimedia/dynamic-layers/meta-jupyter/recipes-multimedia/gstreamer/gstreamer-vdu-notebooks_0.1.bb
@@ -6,7 +6,7 @@ inherit jupyter-examples
 
 require gstreamer-multimedia-notebooks_0.1.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.%.bbappend
index a73b2c89..f1494391 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-devtools_1.22.%.bbappend
@@ -4,4 +4,4 @@ SRC_URI:append = " \
     file://0001-connect-has-a-different-signature-on-musl.patch \
 "
 
-S = "${WORKDIR}/git/subprojects/gst-devtools"
+S = "${UNPACKDIR}/git/subprojects/gst-devtools"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-interpipes_v1.1.8.bb b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-interpipes_v1.1.8.bb
index e1ee3328..aeeab259 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-interpipes_v1.1.8.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-interpipes_v1.1.8.bb
@@ -13,7 +13,7 @@ SRCBRANCH ?= "master"
 SRCREV = "814982ecd735e42ff2d14ce7c43039c259ec928b"
 SRC_URI = "gitsm://github.com/RidgeRun/gst-interpipe.git;protocol=https;branch=${SRCBRANCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 FILES:${PN} += "${libdir}/gstreamer-1.0/libgstinterpipe.so"
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-perf_1.0.bb b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-perf_1.0.bb
index 2e0aae64..9dee616d 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-perf_1.0.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gst-perf_1.0.bb
@@ -14,7 +14,7 @@ SRCBRANCH ?= "master"
 SRCREV ?= "d50ddc4a8c0dedd4f2de77d7f3f570548a1a0d76"
 SRC_URI = "git://github.com/RidgeRun/gst-perf.git;protocol=https;branch=${SRCBRANCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 FILES:${PN} += "${libdir}/gstreamer-1.0/libgstperf.so"
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.%.bbappend
index f157a7cb..4fd3701a 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.22.%.bbappend
@@ -1,3 +1,3 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gst-libav"
+S = "${UNPACKDIR}/git/subprojects/gst-libav"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend
index 25ffe106..49d0ee2b 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.22.%.bbappend
@@ -1,6 +1,6 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gst-omx"
+S = "${UNPACKDIR}/git/subprojects/gst-omx"
 
 RDEPENDS:${PN} .= "${@bb.utils.contains('MACHINE_FEATURES', 'vcu', ' libvcu-omxil', '', d)}"
 DEPENDS .= "${@bb.utils.contains('MACHINE_FEATURES', 'vcu', ' libvcu-omxil', '', d)}"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend
index 2775d0f8..78eaec32 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.%.bbappend
@@ -9,4 +9,4 @@ SRC_URI:append = " \
 PACKAGECONFIG[mediasrcbin] = "-Dmediasrcbin=enabled,-Dmediasrcbin=disabled,media-ctl"
 PACKAGECONFIG:append = " faac kms faad opusparse mediasrcbin"
 
-S = "${WORKDIR}/git/subprojects/gst-plugins-bad"
+S = "${UNPACKDIR}/git/subprojects/gst-plugins-bad"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
index f709b204..474397f0 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.%.bbappend
@@ -8,4 +8,4 @@ SRC_URI:append = " \
 
 PACKAGECONFIG:append = " opus"
 
-S = "${WORKDIR}/git/subprojects/gst-plugins-base"
+S = "${UNPACKDIR}/git/subprojects/gst-plugins-base"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend
index 2d86bffb..65ed05d0 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.%.bbappend
@@ -7,4 +7,4 @@ SRC_URI:append = " \
 
 PACKAGECONFIG:append = " vpx"
 
-S = "${WORKDIR}/git/subprojects/gst-plugins-good"
+S = "${UNPACKDIR}/git/subprojects/gst-plugins-good"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.%.bbappend
index 575086f4..27230912 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.%.bbappend
@@ -1,3 +1,3 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gst-plugins-ugly"
+S = "${UNPACKDIR}/git/subprojects/gst-plugins-ugly"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.%.bbappend
index cae17237..bce796c4 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-python_1.22.%.bbappend
@@ -1,4 +1,4 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gst-python"
+S = "${UNPACKDIR}/git/subprojects/gst-python"
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.%.bbappend
index dfa5635c..52656a18 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.22.%.bbappend
@@ -1,3 +1,3 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gst-rtsp-server"
+S = "${UNPACKDIR}/git/subprojects/gst-rtsp-server"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.%.bbappend
index 28427eac..1d582091 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.22.%.bbappend
@@ -1,3 +1,3 @@
 require gstreamer-xilinx-1.22.%.inc
 
-S = "${WORKDIR}/git/subprojects/gstreamer-vaapi"
+S = "${UNPACKDIR}/git/subprojects/gstreamer-vaapi"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.%.bbappend b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.%.bbappend
index 6f2f79a4..fca673a8 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.%.bbappend
+++ b/meta-xilinx-multimedia/recipes-multimedia/gstreamer/gstreamer1.0_1.22.%.bbappend
@@ -10,4 +10,4 @@ SRC_URI:append = " \
 
 PACKAGECONFIG:append = " tracer-hooks coretracers"
 
-S = "${WORKDIR}/git/subprojects/gstreamer"
+S = "${UNPACKDIR}/git/subprojects/gstreamer"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p30.bb b/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p30.bb
index 4729ea43..47242197 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p30.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p30.bb
@@ -8,9 +8,11 @@ SRC_URI[sha256sum] = "37f0ff251a606c2dcfa26c19fe6bf843234b4e7a8889cfab50bc26f644
 
 inherit allarch
 
+S = "${UNPACKDIR}"
+
 do_install() {
     install -d ${D}${datadir}/movies
-    install -m 0644 ${WORKDIR}/bbb_sunflower_2160p_30fps_normal.mp4 ${D}${datadir}/movies/
+    install -m 0644 ${S}/bbb_sunflower_2160p_30fps_normal.mp4 ${D}${datadir}/movies/
 }
 
 FILES:${PN} += "${datadir}/movies"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p60.bb b/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p60.bb
index c045e714..36208e67 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p60.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/sample-content/bigbuckbunny-2160p60.bb
@@ -8,9 +8,11 @@ SRC_URI[sha256sum] = "35db9a007021f1b0066993e1d2c4448c83a8b279f799c97d33cbba7398
 
 inherit allarch
 
+S = "${UNPACKDIR}"
+
 do_install() {
     install -d ${D}${datadir}/movies
-    install -m 0644 ${WORKDIR}/bbb_sunflower_2160p_60fps_normal.mp4 ${D}${datadir}/movies/
+    install -m 0644 ${S}/bbb_sunflower_2160p_60fps_normal.mp4 ${D}${datadir}/movies/
 }
 
 FILES:${PN} += "${datadir}/movies"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index 2d3c3a89..ba2060f5 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
@@ -32,7 +32,7 @@ KERNEL_MODULE_AUTOLOAD += "dmaproxy"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.2.bb
index 91b1d1be..fde956f5 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/kernel-module-vcu_2024.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
@@ -32,7 +32,7 @@ KERNEL_MODULE_AUTOLOAD += "dmaproxy"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/99-vcu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
index d0315185..1e690058 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -16,7 +16,7 @@ SRCREV = "dc34204543b89997577bd2c9757b3c218e6caccc"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.2.bb
index 6137f9e3..de466947 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.2.bb
@@ -16,7 +16,7 @@ SRCREV = "b259cf0b3eaa1b0b17d2e807f233bfef5b9dbddd"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.79-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index 6854d73a..c6b54b51 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -15,7 +15,7 @@ SRCREV = "940f9fa933402de6f959911c236f36add5dd3a40"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.80-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.80-xilinx-v2024.2.bb
index 7e4f209a..fafc69e5 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.80-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-ctrlsw_1.0.80-xilinx-v2024.2.bb
@@ -15,7 +15,7 @@ SRCREV = "bcb5ff5f77f2a8ea8222eb64b69c1f9f730cc6b1"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
index f500ec36..02aa0b8e 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
 
 PV .= "+git"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 BRANCH ?= "xlnx_rel_v2024.1"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240325-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240325-xilinx-v2024.2.bb
index 4eb810e4..5ed96f1a 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240325-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu/vcu-firmware_20240325-xilinx-v2024.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=9bef8aa9d1eba8aca1b7dffdef500262"
 
 PV .= "+git"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 BRANCH ?= "xlnx_rel_v2024.2"
 REPO ?= "git://github.com/Xilinx/vcu-firmware.git;protocol=https"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu2/kernel-module-vcu2_2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu2/kernel-module-vcu2_2024.2.bb
index a8e336a8..8628b624 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu2/kernel-module-vcu2_2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu2/kernel-module-vcu2_2024.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
@@ -30,7 +30,7 @@ RDEPENDS:${PN} = "vcu2-firmware"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vcu2-codec.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/99-vcu2-codec.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu2/libvcu2-omxil_1.1.2-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu2/libvcu2-omxil_1.1.2-xilinx-v2024.2.bb
index bf181345..df5ec38b 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu2/libvcu2-omxil_1.1.2-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu2/libvcu2-omxil_1.1.2-xilinx-v2024.2.bb
@@ -13,7 +13,7 @@ SRCREV = "130d56172f768e5d2f8c8a3aa75fcbad581ab2d9"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-ctrlsw_1.0.62-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-ctrlsw_1.0.62-xilinx-v2024.2.bb
index fbc33d88..125bb839 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-ctrlsw_1.0.62-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-ctrlsw_1.0.62-xilinx-v2024.2.bb
@@ -12,7 +12,7 @@ SRCREV = "95b5e23881359964e7fbbf97fd754a91b6975a9b"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 inherit features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-firmware_20240329-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-firmware_20240329-xilinx-v2024.2.bb
index de6998fe..bd06032c 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-firmware_20240329-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vcu2/vcu2-firmware_20240329-xilinx-v2024.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=19975964707b2e6e3baf7acf31d2bef0"
 
 PV .= "+git"
 
-S  = "${WORKDIR}/git"
+S  = "${UNPACKDIR}/git"
 
 BRANCH ?="xlnx_rel_v2024.2"
 REPO ?= "git://github.com/Xilinx/vcu2-firmware.git;protocol=https"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 7f5fc367..39df1545 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH ?= "xlnx_rel_v2024.1"
@@ -28,7 +28,7 @@ RDEPENDS:${PN} = "vdu-firmware"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.2.bb
index 2e784e3c..a79e82d2 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/kernel-module-vdu_2024.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=eb723b61539feef013de476e68b5c50a"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
 BRANCH ?= "xlnx_rel_v2024.2"
@@ -28,7 +28,7 @@ RDEPENDS:${PN} = "vdu-firmware"
 
 do_install:append() {
     install -d ${D}${sysconfdir}/udev/rules.d
-    install -m 0644 ${WORKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
+    install -m 0644 ${UNPACKDIR}/99-vdu-enc-dec.rules ${D}${sysconfdir}/udev/rules.d/
 }
 
 FILES:${PN} = "${sysconfdir}/udev/rules.d/*"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
index e9ed0376..b8597e2f 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
@@ -12,8 +12,8 @@ SRCREV ?= "af9c6e8935799f4dcd579b0164dd05eb039b569d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
+B = "${S}"
 
 inherit autotools features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.2.bb
index 0fb0d1ea..efce94b4 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.2.bb
@@ -12,8 +12,8 @@ SRCREV ?= "af9c6e8935799f4dcd579b0164dd05eb039b569d"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
+B = "${S}"
 
 inherit autotools features_check
 
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index 6b7a4f6a..2cacf832 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -15,7 +15,7 @@ SRCREV ?= "fb8730a808b707bfb86d3d64881899214a951ff6"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}"
 
 inherit autotools features_check
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.2.bb
index 7134e7e0..ed61614a 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-ctrlsw_1.0.79-xilinx-v2024.2.bb
@@ -15,7 +15,7 @@ SRCREV ?= "361a822a223dc430ca44641be148fe1cbc13dd10"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}"
 
 inherit autotools features_check
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
index c4330a3c..79a528ad 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}"
 
 BRANCH ?= "xlnx_rel_v2024.1"
diff --git a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.2.bb b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.2.bb
index 75bc21d9..d566ff4c 100644
--- a/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.2.bb
+++ b/meta-xilinx-multimedia/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=722a9d20bf58ac06585a6d91ee36e60e"
 
 PV .= "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}"
 
 BRANCH ?= "xlnx_rel_v2024.2"
diff --git a/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass b/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
index 76245cf7..644f3b49 100644
--- a/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
+++ b/meta-xilinx-standalone-sdt/classes-recipe/esw.bbclass
@@ -8,7 +8,7 @@ OECMAKE_ARGS:remove = "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
 
 SRCREV_FORMAT = "src_decouple"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 LICFILENAME = "license.txt"
diff --git a/meta-xilinx-standalone-sdt/classes-recipe/esw_apps_common.bbclass b/meta-xilinx-standalone-sdt/classes-recipe/esw_apps_common.bbclass
index 85b753a5..734a95f5 100644
--- a/meta-xilinx-standalone-sdt/classes-recipe/esw_apps_common.bbclass
+++ b/meta-xilinx-standalone-sdt/classes-recipe/esw_apps_common.bbclass
@@ -21,10 +21,10 @@ do_install() {
 
 do_deploy() {
     # We need to deploy the stripped elf, hence why not doing it from ${D}
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${DEPLOYDIR}/${APP_IMAGE_NAME}.elf
     ln -sf ${APP_IMAGE_NAME}.elf ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.elf
-    ${OBJCOPY} -O binary ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin
-    install -m 0644 ${WORKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
+    ${OBJCOPY} -O binary ${PKGD}/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${PKGD}/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin
+    install -m 0644 ${PKGD}/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin ${DEPLOYDIR}/${APP_IMAGE_NAME}.bin
     ln -sf ${APP_IMAGE_NAME}.bin ${DEPLOYDIR}/${BPN}-${MACHINE}-${BB_CURRENT_MC}.bin
 }
 
diff --git a/meta-xilinx-standalone-sdt/classes-recipe/esw_examples.bbclass b/meta-xilinx-standalone-sdt/classes-recipe/esw_examples.bbclass
index 9a94f3cd..2696cd00 100644
--- a/meta-xilinx-standalone-sdt/classes-recipe/esw_examples.bbclass
+++ b/meta-xilinx-standalone-sdt/classes-recipe/esw_examples.bbclass
@@ -29,7 +29,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index f99db010..dbcbbc11 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
@@ -1,7 +1,7 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
index f99db010..dbcbbc11 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/embeddedsw/esw-conf_2024.2.bb
@@ -1,7 +1,7 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 INHIBIT_DEFAULT_DEPS = "1"
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/image-selector/image-selector_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-bsp/image-selector/image-selector_2024.2.bb
index 69aebf06..d7e55c11 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/image-selector/image-selector_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/image-selector/image-selector_2024.2.bb
@@ -10,26 +10,26 @@ ESW_EXECUTABLE_NAME = "imgsel"
 SRC_URI:append = " git://github.com/Xilinx/image-selector.git;protocol=https;branch=main;destsuffix=image-selector;name=image-selector"
 SRCREV_image-selector = "809441712855a64a35496192c180e31328a78b7b"
 
+OECMAKE_SOURCEPATH = "${WORKDIR}/${BPN}/${ESW_COMPONENT_SRC}"
+
 do_configure:prepend() {
     (
     cd ${S}
-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${WORKDIR}/${BPN}/${ESW_COMPONENT_SRC}
-    install -m 0644 *.cmake ${WORKDIR}/${BPN}/${ESW_COMPONENT_SRC}/
-    install -m 0644 ${S}/cmake/UserConfig.cmake ${WORKDIR}/${BPN}/${ESW_COMPONENT_SRC}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${OECMAKE_SOURCEPATH}
+    install -m 0644 *.cmake ${OECMAKE_SOURCEPATH}/
+    install -m 0644 ${S}/cmake/UserConfig.cmake ${OECMAKE_SOURCEPATH}
     )
 }
 
-OECMAKE_SOURCEPATH = "${WORKDIR}/${BPN}/${ESW_COMPONENT_SRC}"
-
 do_compile:append () {
-cat > ${WORKDIR}/${PN}.bif << EOF
+cat > ${S}/${PN}.bif << EOF
     the_ROM_image:
     {
             [bootloader,destination_cpu=a53-0] ${B}/${ESW_EXECUTABLE_NAME}.elf
     }
 EOF
 
-    bootgen -image ${WORKDIR}/${PN}.bif -arch ${SOC_FAMILY} -w -o ${B}/${PN}.bin
+    bootgen -image ${S}/${PN}.bif -arch ${SOC_FAMILY} -w -o ${B}/${PN}.bin
 
     printf "* ${PN}\nSRCREV: ${SRCREV}\nBRANCH: ${BRANCH}\n\n" > ${S}/${PN}.manifest
 }
diff --git a/meta-xilinx-standalone-sdt/recipes-bsp/sdt-artifacts/sdt-artifacts.bb b/meta-xilinx-standalone-sdt/recipes-bsp/sdt-artifacts/sdt-artifacts.bb
index 9c45c3ef..c4f59ad5 100644
--- a/meta-xilinx-standalone-sdt/recipes-bsp/sdt-artifacts/sdt-artifacts.bb
+++ b/meta-xilinx-standalone-sdt/recipes-bsp/sdt-artifacts/sdt-artifacts.bb
@@ -23,8 +23,8 @@ SRC_URI[sha256sum] = "${@d.getVarFlag('SDT_URI', 'sha256sum') or 'undefined'}"
 COMPATIBLE_HOST:xilinx-standalone = "${HOST_SYS}"
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 
-# Don't set S = "${WORKDIR}/git" as we need this to work for other protocols
-S = "${@d.getVarFlag('SDT_URI', 'S') or '${WORKDIR}'}"
+# Don't set S = "${UNPACKDIR}/git" as we need this to work for other protocols
+S = "${@d.getVarFlag('SDT_URI', 'S') or '${UNPACKDIR}'}"
 
 do_configure[noexec] = "1"
 do_compile[noexec] = "1"
@@ -36,7 +36,7 @@ python () {
 
 do_install() {
     install -d ${D}${datadir}/sdt/${MACHINE}
-    if [ "${S}" = "${WORKDIR}" ]; then
+    if [ "${S}" = "${UNPACKDIR}" ]; then
         # If we just copying everything, then we'll copy build components.
         # This fallback is for the case where the user provides each of the
         # files instead of a tarball.  It shouldn't be used, but is here just
@@ -62,7 +62,7 @@ FILES:${PN} = "${datadir}/sdt/${MACHINE}"
 
 do_deploy() {
     install -d ${DEPLOYDIR}/system-dt${IMAGE_VERSION_SUFFIX}
-    if [ "${S}" = "${WORKDIR}" ]; then
+    if [ "${S}" = "${UNPACKDIR}" ]; then
         # If we just copying everything, then we'll copy build components.
         # This fallback is for the case where the user provides each of the
         # files instead of a tarball.  It shouldn't be used, but is here just
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/aiefal_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/aiefal_2024.2.bb
index 7d7b76ac..5af321c9 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/aiefal_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/aiefal_2024.2.bb
@@ -4,7 +4,7 @@ COMPATIBLE_HOST = "aarch64-xilinx-elf"
 
 require ../../meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.2.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
  
 EXTRA_OECMAKE += "-DYOCTO=ON"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/aienginev2_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/aienginev2_2024.2.bb
index 68853d57..5796a2c3 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/aienginev2_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/aienginev2_2024.2.bb
@@ -4,7 +4,7 @@ COMPATIBLE_HOST = "aarch64-xilinx-elf"
 
 require ../../meta-xilinx-core/recipes-bsp/ai-engine/aie-rt-2024.2.inc
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
  
 EXTRA_OECMAKE += "-DYOCTO=ON"
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.1.bb
index f9c5bce6..afb64c6a 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.1.bb
@@ -33,7 +33,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.2.bb
index f9c5bce6..afb64c6a 100644
--- a/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-drivers/clockps-example_2024.2.bb
@@ -33,7 +33,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
index cae39d17..74fbcc69 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.1.bb
@@ -25,7 +25,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb
index cae39d17..74fbcc69 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilffs-example_2024.2.bb
@@ -25,7 +25,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
index a3fb1560..10b3a77f 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.1.bb
@@ -22,7 +22,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb
index a3fb1560..10b3a77f 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilfpga-example_2024.2.bb
@@ -22,7 +22,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
index 600369ad..027a209f 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.1.bb
@@ -31,7 +31,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb
index 600369ad..027a209f 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilmailbox-example_2024.2.bb
@@ -31,7 +31,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
index bd001f64..1921cda4 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb
index bd001f64..1921cda4 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilnvm-example_2024.2.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
index bbe2920b..aae1de1a 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb
index bbe2920b..aae1de1a 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilpuf-example_2024.2.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
index a2b4b7a5..4bc3423c 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.1.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb
index a2b4b7a5..4bc3423c 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilsecure-example_2024.2.bb
@@ -26,7 +26,7 @@ do_install() {
 
 do_deploy() {
     install -d ${DEPLOYDIR}/${BPN}/
-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
index a42d6fd2..d5d729c1 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.1.bb
@@ -1,29 +1,29 @@
-inherit esw deploy

-

-ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"

-

-DEPENDS += "xilskey xilsecure"

-

-do_configure:prepend() {

-    (

-    cd ${S}

-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}

-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/

-    )

-}

-

-ESW_CUSTOM_LINKER_FILE ?= "None"

-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"

-

-do_install() {

-    install -d ${D}/${base_libdir}/firmware

-    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware

-}

-

-do_deploy() {

-    install -d ${DEPLOYDIR}/${BPN}/

-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

-}

-addtask deploy before do_build after do_package

-

-FILES:${PN} = "${base_libdir}/firmware/*.elf"

+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"
+
+DEPENDS += "xilskey xilsecure"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb
index a42d6fd2..d5d729c1 100644
--- a/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb
+++ b/meta-xilinx-standalone-sdt/recipes-libraries/xilskey-example_2024.2.bb
@@ -1,29 +1,29 @@
-inherit esw deploy

-

-ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"

-

-DEPENDS += "xilskey xilsecure"

-

-do_configure:prepend() {

-    (

-    cd ${S}

-    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}

-    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/

-    )

-}

-

-ESW_CUSTOM_LINKER_FILE ?= "None"

-EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"

-

-do_install() {

-    install -d ${D}/${base_libdir}/firmware

-    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware

-}

-

-do_deploy() {

-    install -d ${DEPLOYDIR}/${BPN}/

-    install -Dm 0644 ${WORKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

-}

-addtask deploy before do_build after do_package

-

-FILES:${PN} = "${base_libdir}/firmware/*.elf"

+inherit esw deploy
+
+ESW_COMPONENT_SRC = "/lib/sw_services/xilskey/examples/"
+
+DEPENDS += "xilskey xilsecure"
+
+do_configure:prepend() {
+    (
+    cd ${S}
+    lopper ${DTS_FILE} -- baremetallinker_xlnx.py ${ESW_MACHINE} ${S}/${ESW_COMPONENT_SRC}
+    install -m 0755 *.cmake ${S}/${ESW_COMPONENT_SRC}/
+    )
+}
+
+ESW_CUSTOM_LINKER_FILE ?= "None"
+EXTRA_OECMAKE = "-DCUSTOM_LINKER_FILE=${@d.getVar('ESW_CUSTOM_LINKER_FILE')}"
+
+do_install() {
+    install -d ${D}/${base_libdir}/firmware
+    install -m 0755  ${B}/*.elf ${D}/${base_libdir}/firmware
+}
+
+do_deploy() {
+    install -d ${DEPLOYDIR}/${BPN}/
+    install -Dm 0644 ${PKGD}/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
+}
+addtask deploy before do_build after do_package
+
+FILES:${PN} = "${base_libdir}/firmware/*.elf"
diff --git a/meta-xilinx-standalone/recipes-apps/rfdc-examples/rfdc-examples.inc b/meta-xilinx-standalone/recipes-apps/rfdc-examples/rfdc-examples.inc
index ffb70044..117cf503 100644
--- a/meta-xilinx-standalone/recipes-apps/rfdc-examples/rfdc-examples.inc
+++ b/meta-xilinx-standalone/recipes-apps/rfdc-examples/rfdc-examples.inc
@@ -11,7 +11,7 @@ RDEPENDS:${PN} = "librfdc"
 
 PACKAGES = "${PN}-dbg ${PN}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${WORKDIR}/build"
 
 FLAG = ""
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 6c581670..5b2e123f 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 FSBL_IMAGE_NAME ??= "fsbl-${MACHINE}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 99451c3b..2a00afac 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -10,7 +10,7 @@ COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PLM_IMAGE_NAME ??= "plm-${MACHINE}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index d371da4d..e821c05d 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
@@ -8,7 +8,7 @@ COMPATIBLE_MACHINE:zynqmp = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PMU_FIRMWARE_IMAGE_NAME ??= "pmu-firmware-${MACHINE}"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 6c378270..2bdb17ed 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -10,7 +10,7 @@ COMPATIBLE_MACHINE:versal-net = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # This is the default in most BSPs.  A MACHINE.conf can override this!
 PSM_FIRMWARE_IMAGE_NAME ??= "psm-firmware-${MACHINE}"
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.1.bb
index 04415f5e..2efbfd31 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.2.bb
index 04415f5e..2efbfd31 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.1.bb
index 04415f5e..2efbfd31 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
index 04415f5e..2efbfd31 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeccf/libdfeccf_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.1.bb
index 298621fa..e2a73c39 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.2.bb
index 298621fa..e2a73c39 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.1.bb
index 298621fa..e2a73c39 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
index 298621fa..e2a73c39 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeequ/libdfeequ_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.1.bb
index cac04c14..d15beb53 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.2.bb
index cac04c14..d15beb53 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.1.bb
index cac04c14..d15beb53 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
index cac04c14..d15beb53 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfemix/libdfemix_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.1.bb
index e183b853..a1e51216 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.2.bb
index e183b853..a1e51216 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.1.bb
index e183b853..a1e51216 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
index e183b853..a1e51216 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeofdm/libdfeofdm_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.1.bb
index 570dc6f1..ec6e35d0 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.2.bb
index 570dc6f1..ec6e35d0 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.1.bb
index 570dc6f1..ec6e35d0 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
index 570dc6f1..ec6e35d0 100644
--- a/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/libdfeprach/libdfeprach_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.1.bb
index 04ae540d..5de31f05 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.1.bb
@@ -7,7 +7,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.2.bb
index 04ae540d..5de31f05 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2023.2.bb
@@ -7,7 +7,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.1.bb
index 04ae540d..5de31f05 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.1.bb
@@ -7,7 +7,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
index 04ae540d..5de31f05 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfclk/librfclk_2024.2.bb
@@ -7,7 +7,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.1.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.1.bb
index 35cd2a1a..d638af27 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.2.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.2.bb
index 35cd2a1a..d638af27 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2023.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.1.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.1.bb
index 35cd2a1a..d638af27 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.1.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.1.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
diff --git a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
index 35cd2a1a..d638af27 100644
--- a/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
+++ b/meta-xilinx-standalone/recipes-bsp/librfdc/librfdc_2024.2.bb
@@ -8,7 +8,7 @@ REQUIRED_MACHINE_FEATURES = "rfsoc"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"