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>

2 files changed, 9 insertions, 9 deletions

diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
index 7d374291..7959d9db 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/device-tree.bbappend
@@ -1,7 +1,7 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 
-# openamp.dtsi is in the WORKDIR
-DT_INCLUDE:append = " ${WORKDIR}"
+# openamp.dtsi is in the UNPACKDIR
+DT_INCLUDE:append = " ${UNPACKDIR}"
 
 do_configure[vardeps] += "ENABLE_OPENAMP_DTSI OPENAMP_EXTRA_DT_INCLUDE_FILES"
 
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
index 7b626ee3..92b0227b 100644
--- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
+++ b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-bsp/device-tree/open-amp-device-tree.bb
@@ -29,7 +29,7 @@ PROVIDES:remove = "virtual/dtb"
 
 DEPENDS += "python3-dtc-native"
 
-S = "${WORKDIR}/source"
+S = "${UNPACKDIR}/source"
 
 # Set a default so something resolves
 SOC_FAMILY ??= "SOC_FAMILY"
@@ -37,12 +37,12 @@ SOC_FAMILY ??= "SOC_FAMILY"
 do_configure:prepend() {
         mkdir -p source
 
-        if [ -e ${WORKDIR}/${MACHINE}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${MACHINE}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${MACHINE}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
-        elif [ -e ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
-                install ${WORKDIR}/${SOC_FAMILY}-openamp.dtsi ${WORKDIR}/source/. || :
-                install ${WORKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${WORKDIR}/source/openamp.dts
+        if [ -e ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${MACHINE}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${MACHINE}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
+        elif [ -e ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ]; then
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp.dtsi ${UNPACKDIR}/source/. || :
+                install ${UNPACKDIR}/${SOC_FAMILY}-openamp-overlay.dts ${UNPACKDIR}/source/openamp.dts
         else
                 bbfatal "${MACHINE}-openamp-overlay.dts or ${SOC_FAMILY}-openamp-overlay.dts file is not available.  Cannot automatically add OpenAMP dtbo file."
         fi