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>

3 files changed, 5 insertions, 7 deletions

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 = "\