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>

25 files changed, 92 insertions, 92 deletions

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"