110 files changed, 169 insertions, 167 deletions

diff --git a/meta-microblaze/conf/layer.conf b/meta-microblaze/conf/layer.conf
index d1443c16..045550eb 100644
--- a/meta-microblaze/conf/layer.conf
+++ b/meta-microblaze/conf/layer.conf
@@ -20,9 +20,9 @@ OLDEST_KERNEL:microblaze = "3.15"
 
 INHERIT += "rust_microblaze"
 
-# We want to use gcc 12.x for the microblaze stuff, and 13.x for any host tooling
+# We want to use gcc 12.x for the microblaze stuff, and 14.x for any host tooling
 GCCVERSION:microblaze = "12.2.%"
-SDKGCCVERSION:microblaze = "13.%"
+SDKGCCVERSION:microblaze = "14.%"
 
 GDBVERSION:microblaze = "12.1"
 # canon-prefix-map doesn't exist in gcc 12.x
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross-canadian_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-cross_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-cross_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-cross_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-cross_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-crosssdk_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-runtime_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-runtime_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-runtime_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc-sanitizers_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/gcc_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/gcc_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/gcc_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/gcc_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc-initial_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/libgcc-initial_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc-initial_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/libgcc_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgcc_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/libgcc_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/libgcc_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gcc/libgfortran_13.%.bbappend b/meta-microblaze/recipes-devtools/gcc/libgfortran_14.%.bbappend
index d1df2061..d1df2061 100644
--- a/meta-microblaze/recipes-devtools/gcc/libgfortran_13.%.bbappend
+++ b/meta-microblaze/recipes-devtools/gcc/libgfortran_14.%.bbappend
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
index 925b0c2f..aef0d2a1 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-common.inc
@@ -14,7 +14,7 @@ inherit autotools texinfo
 
 UPSTREAM_CHECK_GITTAGREGEX = "gdb\-(?P<pver>.+)\-release"
 
-B = "${WORKDIR}/build-${TARGET_SYS}"
+B = "${UNPACKDIR}/build-${TARGET_SYS}"
 
 EXPAT = "--with-expat --with-libexpat-prefix=${STAGING_DIR_HOST}"
 
@@ -33,7 +33,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-x --disable-werror \
 PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}"
 # Use --without-system-readline to compile with readline 5.
 PACKAGECONFIG[readline] = "--with-system-readline,--without-system-readline,readline"
-PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python3,python3 python3-codecs"
+PACKAGECONFIG[python] = "--with-python=${UNPACKDIR}/python,--without-python,python3,python3 python3-codecs"
 PACKAGECONFIG[babeltrace] = "--with-babeltrace,--without-babeltrace,babeltrace"
 # ncurses is already a hard DEPENDS, but would be added here if it weren't
 PACKAGECONFIG[tui] = "--enable-tui,--disable-tui"
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
index c463574b..a6857cf7 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
+++ b/meta-microblaze/recipes-devtools/gdb/gdb-cross-canadian.inc
@@ -13,7 +13,7 @@ GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
 
 # Overrides PACKAGECONFIG variables in gdb-common.inc
 PACKAGECONFIG ??= "readline ${@bb.utils.filter('DISTRO_FEATURES', 'debuginfod', d)}"
-PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,nativesdk-python3, \
+PACKAGECONFIG[python] = "--with-python=${UNPACKDIR}/python,--without-python,nativesdk-python3, \
                          nativesdk-python3-core \
                          nativesdk-python3-codecs nativesdk-python3-netclient \
                          "
@@ -23,7 +23,7 @@ PACKAGECONFIG[debuginfod] = "--with-debuginfod, --without-debuginfod, nativesdk-
 SSTATE_ALLOW_OVERLAP_FILES += "${STAGING_DATADIR}/gdb"
 
 do_configure:prepend() {
-cat > ${WORKDIR}/python << EOF
+cat > ${UNPACKDIR}/python << EOF
 #! /bin/sh
 case "\$2" in
         --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
@@ -33,7 +33,7 @@ case "\$2" in
 esac
 exit 0
 EOF
-        chmod +x ${WORKDIR}/python
+        chmod +x ${UNPACKDIR}/python
 }
 
 # we don't want gdb to provide bfd/iberty/opcodes, which instead will override the
diff --git a/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb b/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb
index 9c6db4ca..ca915d68 100644
--- a/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb
+++ b/meta-microblaze/recipes-devtools/gdb/gdb_12.1.bb
@@ -23,7 +23,7 @@ EXTRA_OEMAKE:append:libc-musl = "\
 
 do_configure:prepend() {
         if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
-                cat > ${WORKDIR}/python << EOF
+                cat > ${UNPACKDIR}/python << EOF
 #!/bin/sh
 case "\$2" in
         --includes) echo "-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}/" ;;
@@ -33,7 +33,7 @@ case "\$2" in
 esac
 exit 0
 EOF
-                chmod +x ${WORKDIR}/python
+                chmod +x ${UNPACKDIR}/python
         fi
 }
 
diff --git a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend
index 8fdf14bb..1ff1e058 100644
--- a/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend
+++ b/meta-xilinx-bsp/recipes-bsp/dfx-mgr/dfx-mgr_%.bbappend
@@ -6,5 +6,5 @@ PACKAGE_ARCH:zcu106-zynqmp = "${MACHINE_ARCH}"
 
 # ZCU106 eval board firmware detection script.
 do_install:append:zcu106-zynqmp () {
-        install -m 0755 ${WORKDIR}/zcu106-xlnx-firmware-detect ${D}${bindir}/xlnx-firmware-detect
+        install -m 0755 ${UNPACKDIR}/zcu106-xlnx-firmware-detect ${D}${bindir}/xlnx-firmware-detect
 }
diff --git a/meta-xilinx-contrib/recipes-bsp/bitstream/bitstream-extraction_%.bbappend b/meta-xilinx-contrib/recipes-bsp/bitstream/bitstream-extraction_%.bbappend
deleted file mode 100644
index 4653c93a..00000000
--- a/meta-xilinx-contrib/recipes-bsp/bitstream/bitstream-extraction_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-COMPATIBLE_MACHINE:zybo-linux-bd-zynq7 = "^$"
-
diff --git a/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
index 22b8b1bb..239b827c 100644
--- a/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
+++ b/meta-xilinx-contrib/recipes-bsp/reference-design/zybo-linux-bd.bb
@@ -18,11 +18,11 @@ SRCREV = "63ca49fe027da49f3b0ac636bd404fd31fbbd945"
 
 PV = "+git"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 HDF = "/Projects/${HW_BD}/hw_handoff/${HW_BD}_wrapper.hdf"
 
-S ?= "${WORKDIR}/${MACHINE}"
+S ?= "${UNPACKDIR}/${MACHINE}"
 
 PROVIDES = "virtual/bitstream virtual/xilinx-platform-init"
 
diff --git a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 99793df2..a32bcbd4 100644
--- a/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/meta-xilinx-contrib/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -14,9 +14,9 @@ do_install:append:minized-zynq7() {
 
        install -d ${D}${bindir}
 
-       install -m 0644 ${WORKDIR}/cyw-fmac-nvram/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/
-       install -m 0644 ${WORKDIR}/cyw-bt-patch/CYW43430A1.1DX.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
-       install -m 0644 ${WORKDIR}/cyw-fmac-utils-imx32/wl ${D}${bindir}
+       install -m 0644 ${UNPACKDIR}/cyw-fmac-nvram/brcmfmac43430-sdio.txt ${D}${nonarch_base_libdir}/firmware/brcm/
+       install -m 0644 ${UNPACKDIR}/cyw-bt-patch/CYW43430A1.1DX.hcd ${D}${nonarch_base_libdir}/firmware/brcm/
+       install -m 0644 ${UNPACKDIR}/cyw-fmac-utils-imx32/wl ${D}${bindir}
 }
 
 PACKAGES:prepend:minized-zynq7 = "\
diff --git a/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass b/meta-xilinx-core/classes-recipe/dfx_user_dts.bbclass
index 188d594b..1b5f451f 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..0b826ee2 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 ${UNPACKDIR}/${BOOT_VOLUME_ID}.img
+        mkfs.vfat -n "${BOOT_VOLUME_ID}" -S 512 -C ${UNPACKDIR}/${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 ${UNPACKDIR}/${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 ${UNPACKDIR}/${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 ${UNPACKDIR}/${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=${UNPACKDIR}/${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 7dcee565..fd7681e6 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}"
+DT_INCLUDE:append = " ${UNPACKDIR}"
 
 do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_OVERLAYS"
 
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 9f481fec..68c4d0f9 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
@@ -32,7 +32,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"
@@ -40,12 +40,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.1.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
index 1f1d0606..7080379f 100644
--- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.bb
+++ b/meta-xilinx-core/recipes-apps/image-update/image-update_1.1.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://${UNPACKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b"
 
 BRANCH = "xlnx_rel_v2024.1"
 SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https"
@@ -12,7 +12,7 @@ SRCREV = "a68308f329578d3585fd335071a9184aa7f46d2e"
 
 RDEPENDS:${PN} += "freeipmi"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
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 c609f3e4..0803887d 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"
 
 COMPATIBLE_MACHINE = "^$"
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 154d02cf..8ee45d22 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"
 
 COMPATIBLE_MACHINE = "^$"
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 075fd94c..2ed7aece 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"
 
 COMPATIBLE_MACHINE = "^$"
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 7bb4b849..f47c4eef 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"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
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 45e38977..6c232a37 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"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
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 5c479d05..425ec5ca 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"
 
 COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:versal-ai-core = "versal-ai-core"
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 df97c3cf..1678c17b 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,8 +9,8 @@ inherit deploy
 
 DEPENDS += "u-boot-mkimage-native"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
+S = "${UNPACKDIR}/git"
+B = "${UNPACKDIR}/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 deb8bb3d..b74f07fe 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
@@ -15,6 +15,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")
@@ -24,9 +26,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 ${UNPACKDIR}/${PDI_PATH} ];then
         install -d ${D}/boot
-        install -m 0644 ${WORKDIR}/${PDI_PATH} ${D}/boot/base-design.pdi
+        install -m 0644 ${UNPACKDIR}/${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 e0e1e506..38824238 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
@@ -162,10 +162,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/bootbin/xilinx-mcs_1.0.bb b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
index 48c7bca9..655eca2f 100644
--- a/meta-xilinx-core/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/bootbin/xilinx-mcs_1.0.bb
@@ -26,7 +26,7 @@ MB_OUT_FORMAT  ??= "mcs"
 BOOT_EXT = "${@d.getVar('MB_OUT_FORMAT').lower()}"
 
 BITSTREAM_FILE ?= "${RECIPE_SYSROOT}/boot/bitstream/download.bit"
-B = "${WORKDIR}/build"
+B = "${UNPACKDIR}/build"
 WR_CFGMEM_MISC ?= "-loadbit \" up 0 ${BITSTREAM_FILE}\""
 
 do_check_for_vivado() {
diff --git a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
index 8b1e52ac..7238823d 100644
--- a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb
@@ -15,7 +15,7 @@ COMPATIBLE_MACHINE:versal = "versal"
 
 PACKAGE_ARCH ?= "${MACHINE_ARCH}"
 
-B = "${WORKDIR}/build"
+B = "${UNPACKDIR}/build"
 
 BOOTGEN_CMD ?= "bootgen"
 BOOTGEN_ARGS ?= "-arch versal"
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 9367fa2c..f62e9512 100644
--- a/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
+++ b/meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb
@@ -70,8 +70,8 @@ do_configure:prepend () {
     fi
 
     for f in ${EXTRA_DT_FILES} ${EXTRA_OVERLAYS}; 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 1d4ab5a3..e5cb33b1 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
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 b15fff74..f60a801b 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
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 60096e33..1200a187 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
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 28f997f2..a8b9d62e 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
@@ -18,7 +18,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 2c180561..471de84d 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_1.0.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 287246c2..3bfa7085 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.1.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 b3ccb884..ce9c07b2 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2023.2.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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 42e67ce6..3450872e 100644
--- a/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
+++ b/meta-xilinx-core/recipes-bsp/libdfx/libdfx_2024.1.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE = "^$"
 COMPATIBLE_MACHINE:zynqmp = "zynqmp"
 COMPATIBLE_MACHINE:versal = "versal"
 
-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..9c8bd7a8 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,8 +6,8 @@ UBRANCHARG = "${@['nobranch=1', 'branch=${UBRANCH}'][d.getVar('UBRANCH', True) !
 
 SRC_URI = "${UBOOTURI};${UBRANCHARG}"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
+S = "${UNPACKDIR}/git"
+B = "${UNPACKDIR}/build"
 
 UBOOT_MB_INC = ""
 UBOOT_MB_INC:microblaze = "u-boot-xlnx-microblaze.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 985ca427..24fd46e5 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"
@@ -251,14 +253,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"
+        "${UNPACKDIR}/boot.cmd.${BOOTMODE}${BOOTFILE_EXT}" > "${UNPACKDIR}/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 "${UNPACKDIR}/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"
+        "${UNPACKDIR}/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 1efc5392..3f59ef7d 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
@@ -93,7 +93,7 @@ DEVICETREE_OVERLAY_LOAD_ADDRESS = "${@hex(int(d.getVar("DEVICETREE_LOAD_ADDRESS"
 
 python do_compile() {
     env = uenv_populate(d)
-    with open(d.expand("${WORKDIR}/uEnv.txt"), "w") as f:
+    with open(d.expand("${UNPACKDIR}/uEnv.txt"), "w") as f:
         for k, v in env.items():
             f.write("{0}={1}\n".format(k, v))
 }
@@ -101,11 +101,11 @@ python do_compile() {
 FILES:${PN} += "/boot/uEnv.txt"
 
 do_install() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${D}/boot/uEnv.txt
+        install -Dm 0644 ${UNPACKDIR}/uEnv.txt ${D}/boot/uEnv.txt
 }
 
 do_deploy() {
-        install -Dm 0644 ${WORKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv.txt
+        install -Dm 0644 ${UNPACKDIR}/uEnv.txt ${DEPLOYDIR}/uEnv.txt
 }
 addtask do_deploy after do_compile before do_build
 
diff --git a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
index 334b786b..95e9b016 100644
--- a/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
+++ b/meta-xilinx-core/recipes-connectivity/slirp/libslirp_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=bca0186b14e6b05e338e729f106db727"
 SRC_URI = "git://gitlab.freedesktop.org/slirp/libslirp.git;protocol=https;branch=master"
 SRCREV = "3ad1710a96678fe79066b1469cead4058713a1d9"
 PV = "4.7.0"
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 DEPENDS = " \
     glib-2.0 \
diff --git a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
index 3c68f10d..3e3577d5 100644
--- a/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.bb
+++ b/meta-xilinx-core/recipes-devtools/bootgen/bootgen_2024.1.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..11d9146c 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
+++ b/meta-xilinx-core/recipes-devtools/qemu/flashstrip_1.0.bb
@@ -4,17 +4,17 @@ DESCRIPTION = "Building and installing flash strip utility"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://../flash_stripe.c;beginline=1;endline=23;md5=abb859d98b7c4eede655e1b71824125a"
 
-B = "${WORKDIR}/build"
+B = "${UNPACKDIR}/build"
 
 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} ${UNPACKDIR}/flash_stripe.c -o flash_strip
+    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_unstrip
+    ${CC} ${UNPACKDIR}/flash_stripe.c -o flash_strip_bw -DFLASH_STRIPE_BW
+    ${CC} ${UNPACKDIR}/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..7772fc29 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -123,7 +123,7 @@ EXTRA_OECONF = " \
 EXTRA_OECONF:append:class-target = " --cross-prefix=${HOST_PREFIX}"
 EXTRA_OECONF:append:class-nativesdk = " --cross-prefix=${HOST_PREFIX}"
 
-B = "${WORKDIR}/build"
+B = "${UNPACKDIR}/build"
 
 #EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3"
 
@@ -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 3e56e349..6121cf88 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-devicetrees.inc
@@ -14,7 +14,7 @@ REPO ?= "git://github.com/Xilinx/qemu-devicetrees.git;protocol=https"
 BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}"
 SRC_URI = "${REPO};${BRANCHARG}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 # Don't need to do anything
 do_install() {
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 179903c5..53ad1145 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
@@ -72,7 +72,7 @@ SRC_URI += "\
 # Patch doesn't apply to 8.1.0
 #           file://fixmips.patch 
 
-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 0e3bfc84..3c8bb171 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/libgles/libmali-xlnx_r9p0-01rel0.bb b/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
index 7f5fba0b..e8d40311 100644
--- a/meta-xilinx-core/recipes-graphics/libgles/libmali-xlnx_r9p0-01rel0.bb
+++ b/meta-xilinx-core/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"
@@ -76,10 +76,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}
@@ -106,7 +106,7 @@ do_install() {
     fi
     if [ "${USE_WL}" = "yes" ]; then
         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
         install -Dm 0644 ${S}/${PV}/${ARCH_PLATFORM_DIR}/wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/wayland/${MONOLITHIC_LIBMALI}
         if [ "${MALI_BACKEND_DEFAULT}" = "wayland" ]; then
             ln -snf wayland/${MONOLITHIC_LIBMALI} ${D}${libdir}/${MONOLITHIC_LIBMALI}
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
index c25970e7..12b117d4 100644
--- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_r9p0-01rel0.bb
+++ b/meta-xilinx-core/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-core/recipes-graphics/wayland/weston_9.0.0.bb b/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
index a534b1b7..af329e30 100644
--- a/meta-xilinx-core/recipes-graphics/wayland/weston_9.0.0.bb
+++ b/meta-xilinx-core/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-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
index 460ff581..3306f1c4 100644
--- a/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
+++ b/meta-xilinx-core/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend
@@ -14,10 +14,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.10.bb b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
index 7e25fe1f..72bad7aa 100644
--- a/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.bb
+++ b/meta-xilinx-core/recipes-kernel/hdmi/kernel-module-hdmi_6.6.10.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.1"
 REPO   ?= "git://github.com/Xilinx/hdmi-modules.git;protocol=https"
diff --git a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
index bee78918..7b083252 100644
--- a/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
+++ b/meta-xilinx-core/recipes-kernel/libtraceevent/libtraceevent_1.7.3.bb
@@ -12,7 +12,7 @@ SRCREV = "dd148189b74da3e2f45c7e536319fec97cb71213"
 SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;branch=${BPN};protocol=https \
            file://meson.patch"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 
 inherit meson pkgconfig
 
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 611e2e91..a09ae9ed 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
@@ -8,7 +8,7 @@ SRC_URI = "\
     file://99-mali-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 897fbb1c..63052933 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-kernel/perf/perf.bb b/meta-xilinx-core/recipes-kernel/perf/perf.bb
index 9164d93a..20c4c2f0 100644
--- a/meta-xilinx-core/recipes-kernel/perf/perf.bb
+++ b/meta-xilinx-core/recipes-kernel/perf/perf.bb
@@ -69,7 +69,7 @@ include ${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perf-perl.inc', '', d)}
 
 inherit kernelsrc
 
-S = "${WORKDIR}/${BP}"
+S = "${UNPACKDIR}/${BP}"
 SPDX_S = "${S}/tools/perf"
 
 # The LDFLAGS is required or some old kernels fails due missing
@@ -99,7 +99,7 @@ EXTRA_OEMAKE = '\
     AR="${AR}" \
     LD="${LD}" \
     EXTRA_CFLAGS="-ldw -I${S}" \
-    YFLAGS='-y --file-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}' \
+    YFLAGS='-y --file-prefix-map=${UNPACKDIR}=${TARGET_DBGSRC_DIR}' \
     EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
     perfexecdir=${libexecdir} \
     NO_GTK2=1 \
@@ -169,7 +169,7 @@ do_install() {
         if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)} && grep -q install-python_ext ${S}/tools/perf/Makefile*; then
             oe_runmake DESTDIR=${D} install-python_ext
             if [ -e ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt ]; then
-                sed -i -e 's#${WORKDIR}##g' ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt
+                sed -i -e 's#${UNPACKDIR}##g' ${D}${libdir}/python*/site-packages/perf-*/SOURCES.txt
             fi
         fi
 }
diff --git a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
index 2d3c3a89..ba2060f5 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/kernel-module-vcu_2024.1.bb
+++ b/meta-xilinx-core/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-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index c968af52..9903db53 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-ctrlsw_1.0.79-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-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-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
index 92ef7301..a6310647 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/libvcu-omxil_1.1.2-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/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-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
index f500ec36..02aa0b8e 100644
--- a/meta-xilinx-core/recipes-multimedia/vcu/vcu-firmware_20240216-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/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-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
index 7f5fc367..39df1545 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/kernel-module-vdu_2024.1.bb
+++ b/meta-xilinx-core/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-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
index 7dfaf20b..08d152d2 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-ctrlsw_1.0.79-xilinx-v2024.1.bb
@@ -12,7 +12,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-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
index 48a6c544..25acc5d2 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/libvdu-omxil_1.1.2-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/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 = "${UNPACKDIR}/git"
 
 inherit autotools features_check
 
diff --git a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb b/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
index c4330a3c..79a528ad 100644
--- a/meta-xilinx-core/recipes-multimedia/vdu/vdu-firmware_20240216-xilinx-v2024.1.bb
+++ b/meta-xilinx-core/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-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-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..60df24e3 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 ${UNPACKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir}
 }
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb
index 37f32a23..21291925 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202410.2.17.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 ${UNPACKDIR}/build/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 c42e9a65..ba9d7893 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 cc5a9ed5..0846b05a 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 6d7d1257..99164115 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
@@ -16,7 +16,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-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 a780684f..dafda422 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
@@ -17,7 +17,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb
index d84d3b85..809e98a6 100644
--- a/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/xrt/xrt_202410.2.17.0.bb
@@ -17,7 +17,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-S = "${WORKDIR}/git/src"
+S = "${UNPACKDIR}/git/src"
 
 inherit cmake pkgconfig
 
diff --git a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
index a7c7e540..13e8b4a3 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202210.2.13.479.bb
@@ -12,7 +12,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/kernel-module-zocl_202220.2.14.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
index 8676639a..2a68cf92 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202220.2.14.0.bb
@@ -10,7 +10,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/kernel-module-zocl_202310.2.15.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
index b91572f9..12aaf8d2 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202310.2.15.0.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-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/kernel-module-zocl_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
index b91572f9..12aaf8d2 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202320.2.16.0.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-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/kernel-module-zocl_202410.2.17.0.bb b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
index b91572f9..12aaf8d2 100644
--- a/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
+++ b/meta-xilinx-core/recipes-xrt/zocl/kernel-module-zocl_202410.2.17.0.bb
@@ -14,7 +14,7 @@ COMPATIBLE_MACHINE ?= "^$"
 COMPATIBLE_MACHINE:zynqmp = ".*"
 COMPATIBLE_MACHINE:versal = ".*"
 
-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-standalone-experimental/classes-recipe/esw.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
index b6f799b9..a299fc9c 100644
--- a/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
+++ b/meta-xilinx-standalone-experimental/classes-recipe/esw.bbclass
@@ -8,8 +8,8 @@ OECMAKE_ARGS:remove = "-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON"
 
 SRCREV_FORMAT = "src_decouple"
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
+S = "${UNPACKDIR}/git"
+B = "${UNPACKDIR}/build"
 OECMAKE_SOURCEPATH = "${S}/${ESW_COMPONENT_SRC}"
 LICFILENAME = "license.txt"
 
@@ -77,7 +77,7 @@ XLNX_CMAKE_SYSTEM_NAME ?= "Generic"
 XLNX_CMAKE_BSP_VARS ?= ""
 
 cmake_do_generate_toolchain_file:append() {
-    cat >> ${WORKDIR}/toolchain.cmake <<EOF
+    cat >> ${UNPACKDIR}/toolchain.cmake <<EOF
     include(CMakeForceCompiler)
     CMAKE_FORCE_C_COMPILER("${OECMAKE_C_COMPILER}" GNU)
     CMAKE_FORCE_CXX_COMPILER("${OECMAKE_CXX_COMPILER}" GNU)
diff --git a/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
index 85b753a5..134d3cd2 100644
--- a/meta-xilinx-standalone-experimental/classes-recipe/esw_apps_common.bbclass
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${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 ${UNPACKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.elf ${UNPACKDIR}/package/${base_libdir}/firmware/${ESW_EXECUTABLE_NAME}.bin
+    install -m 0644 ${UNPACKDIR}/package/${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-experimental/classes-recipe/esw_examples.bbclass b/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
index 9a94f3cd..ae1a9bbb 100644
--- a/meta-xilinx-standalone-experimental/classes-recipe/esw_examples.bbclass
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
index f99db010..2ee17470 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/esw-conf_2024.1.bb
@@ -1,8 +1,8 @@
 # Can't depend on esw since this is needed for setup!
 inherit xlnx-embeddedsw
 
-S = "${WORKDIR}/git"
-B = "${WORKDIR}/build"
+S = "${UNPACKDIR}/git"
+B = "${UNPACKDIR}/build"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
index d40f3cdb..765fb159 100644
--- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
+++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_2024.1.bbappend
@@ -38,14 +38,14 @@ python() {
 }
 
 do_configure:prepend() {
-    if [ -e ${WORKDIR}/psu_init.c ]; then
-        install -m 0644 ${WORKDIR}/psu_init.c ${S}/${ESW_COMPONENT_SRC}
+    if [ -e ${UNPACKDIR}/psu_init.c ]; then
+        install -m 0644 ${UNPACKDIR}/psu_init.c ${S}/${ESW_COMPONENT_SRC}
     else
         bbwarn "Using the default psu_init.c, this may not work correctly."
     fi
 
-    if [ -e ${WORKDIR}/psu_init.h ]; then
-        install -m 0644 ${WORKDIR}/psu_init.h ${S}/${ESW_COMPONENT_SRC}
+    if [ -e ${UNPACKDIR}/psu_init.h ]; then
+        install -m 0644 ${UNPACKDIR}/psu_init.h ${S}/${ESW_COMPONENT_SRC}
     else
         bbwarn "Using the default psu_init.h, this may not work correctly."
     fi
diff --git a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
index f9c5bce6..9e9ba432 100644
--- a/meta-xilinx-standalone-experimental/recipes-drivers/clockps-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
index cae39d17..0cef7d97 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilffs-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
index a3fb1560..a793fa86 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilfpga-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
index 600369ad..518b24c3 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilmailbox-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb
index bd001f64..9d91751c 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilnvm-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
index bbe2920b..114449e9 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilpuf-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
index a2b4b7a5..a806c4ee 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilsecure-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/
 }
 addtask deploy before do_build after do_package
 
diff --git a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
index a42d6fd2..5702beaf 100644
--- a/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-example_2024.1.bb
+++ b/meta-xilinx-standalone-experimental/recipes-libraries/xilskey-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 ${UNPACKDIR}/package/${base_libdir}/firmware/*.elf ${DEPLOYDIR}/${BPN}/

 }

 addtask deploy before do_build after do_package

 

diff --git a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
index fcc041fd..c1658042 100644
--- a/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-standalone/recipes-bsp/device-tree/device-tree.bbappend
@@ -11,6 +11,6 @@ COMPATIBLE_MACHINE:cortexa9-zynq = ".*"
 
 # Enable @ flag on dtc which is required by libxil
 DTC_FLAGS:append:xilinx-standalone = " -@"
-DT_INCLUDE:append:xilinx-standalone = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
+DT_INCLUDE:append:xilinx-standalone = " ${UNPACKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
 DTC_FLAGS:append:xilinx-freertos = " -@"
-DT_INCLUDE:append:xilinx-freertos = " ${WORKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
+DT_INCLUDE:append:xilinx-freertos = " ${UNPACKDIR}/git/device_tree/data/kernel_dtsi/${XILINX_RELEASE_VERSION}/include/"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 0fe837f8..8fdcfe67 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"
 
 APP_DIR = "undefined"
 APP_DIR:zynq = "zynq_fsbl"
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
index 1551f776..22e3068a 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/plm-firmware.inc
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE:versal = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}/lib/sw_apps/versal_plm/src"
 
 # The makefile does not handle parallelization
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/pmu-firmware.inc
index 92dc3cd3..cce1bdd9 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"
 B = "${S}/lib/sw_apps/zynqmp_pmufw/src"
 
 # The makefile does not handle parallelization
diff --git a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
index 05b2a1cc..34d0c899 100644
--- a/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
+++ b/meta-xilinx-standalone/recipes-bsp/embeddedsw/psm-firmware.inc
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE:versal = ".*"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-S = "${WORKDIR}/git"
+S = "${UNPACKDIR}/git"
 B = "${S}/lib/sw_apps/versal_psmfw/src"
 
 # The makefile does not handle parallelization