various: WORKDIR/UNPACKDIR changes

Recently oe-core implemented an architetural change that WORKDIR is no
longer to be used as a dumping group for miscellaneous files.

link: https://lists.openembedded.org/g/openembedded-architecture/topic/cleanup_of_workdir_by/105739556
oe-core: e022d62ba917 ("base/bitbake.conf: Introduce UNPACKDIR")

Based on changes submitted by Trevor Woerner <twoerner@gmail.com>

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

5 files changed, 6 insertions, 6 deletions

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