Recently oe-core implemented an architectural change such that WORKDIR is no
longer to be used as a dumping ground for miscellaneous files and temporaries.
This patch includes any updates required to build the ultra96 MACHINE.
link:
https://lists.openembedded.org/g/openembedded-architecture/topic/cleanup_of_workdir_by/105739556
oe-core: e022d62ba917 ("base/bitbake.conf: Introduce UNPACKDIR")
Signed-off-by: Trevor Woerner <[email protected]>
---
meta-xilinx-core/recipes-bsp/device-tree/device-tree.bb | 4 ++--
.../fpga-manager-script/fpga-manager-script_1.0.bb | 4 ++--
.../recipes-bsp/pmu-firmware/pmu-rom-native.bb | 2 +-
meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb | 8 +++++---
meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc | 4 ++--
.../qemu/qemu-xilinx-multiarch-helper-native_1.0.bb | 4 +++-
.../qemu/qemu-xilinx-system-native_8.1.0.bb | 2 +-
.../linux-xlnx-udev-rules/linux-xlnx-udev-rules.bb | 4 ++--
meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb | 2 +-
.../recipes-bsp/embeddedsw/fsbl-firmware.inc | 2 +-
.../recipes-bsp/embeddedsw/plm-firmware.inc | 2 +-
.../recipes-bsp/embeddedsw/pmu-firmware.inc | 2 +-
.../recipes-bsp/embeddedsw/psm-firmware.inc | 2 +-
13 files changed, 23 insertions(+), 19 deletions(-)
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 26a1067770a6..c1216af7a983 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/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 d22c995c7e1e..74853c48e459 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=0c02eabf57dba52842c5df9b96bccfae"
+LIC_FILES_CHKSUM =
"file://${UNPACKDIR}/fpgautil.c;beginline=1;endline=24;md5=0c02eabf57dba52842c5df9b96bccfae"
SRC_URI = "\
file://fpgautil.c \
"
-S = "${WORKDIR}"
+S = "${UNPACKDIR}"
FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
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 44ad93680560..2d36b4a8bbf1 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-scr.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-scr.bb
index ac391c3cffa0..c0ed116ae835 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
@@ -48,6 +48,8 @@ SRC_URI = " \
file://pxeboot.pxe \
"
+S = "${UNPACKDIR}"
+
# Even thought we don't create a package, make sure this is unique to the
machine
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -249,14 +251,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-devtools/qemu/qemu-8.1.inc
b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
index 5154e2476368..29b123541676 100644
--- a/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
+++ b/meta-xilinx-core/recipes-devtools/qemu/qemu-8.1.inc
@@ -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-xilinx-multiarch-helper-native_1.0.bb
b/meta-xilinx-core/recipes-devtools/qemu/qemu-xilinx-multiarch-helper-native_1.0.bb
index 1eec01630df0..53e92c3f6d54 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
@@ -9,12 +9,14 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
SRC_URI = "file://qemu-system-aarch64-multiarch"
+S = "${UNPACKDIR}"
+
do_configure[noexec] = "1"
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 0e3bfc844e29..3c8bb17127e9 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-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 611e2e917c29..a09ae9ed2f88 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/lopper/xilinx-lops.bb
b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
index 2648c3724e2b..c44e8ab10c75 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-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc b/meta-xilinx-standalone/recipes-bsp/embeddedsw/fsbl-firmware.inc
index 0fe837f88239..8fdcfe674ef6 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 1551f77681b8..22e3068a5a3e 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 92dc3cd39ede..cce1bdd91ef7 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 05b2a1cc4a82..34d0c8994c76 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
