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]> --- classes/xsctapp.bbclass | 4 +-- classes/xsctbit.bbclass | 2 +- classes/xsctdt.bbclass | 2 +- .../bitstream/bitstream-extraction_git.bb | 2 ++ .../bootbin/xilinx-bootbin_1.0.bbappend | 2 ++ .../embeddedsw/fsbl-firmware_2023.2.bbappend | 32 +++++++++---------- recipes-bsp/hdf/external-hdf_2022.1.bb | 6 ++-- recipes-bsp/hdf/external-hdf_2022.2.bb | 6 ++-- recipes-bsp/hdf/external-hdf_2023.1.bb | 6 ++-- recipes-bsp/hdf/external-hdf_2023.2.bb | 6 ++-- recipes-utils/mb-realoc/mb-realoc.bb | 6 ++-- 11 files changed, 39 insertions(+), 35 deletions(-) diff --git a/classes/xsctapp.bbclass b/classes/xsctapp.bbclass index 77cd6a7f9b88..910d70b92362 100644 --- a/classes/xsctapp.bbclass +++ b/classes/xsctapp.bbclass @@ -1,4 +1,4 @@ -S = "${WORKDIR}/git" +S = "${UNPACKDIR}/git" ESW_VER ?= "${XILINX_XSCT_VERSION}" @@ -10,7 +10,7 @@ XSCTH_BASE_NAME ?= "${PN}${PKGE}-${PKGV}-${PKGR}-${MACHINE}${IMAGE_VERSION_SUFFI FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}" SRC_URI:append = " file://app.tcl" -XSCTH_SCRIPT ?= "${WORKDIR}/app.tcl" +XSCTH_SCRIPT ?= "${UNPACKDIR}/app.tcl" XSCTH_BUILD_DEBUG ?= "0" XSCTH_BUILD_CONFIG ?= "${@['Debug', 'Release'][d.getVar('XSCTH_BUILD_DEBUG') == "0"]}" diff --git a/classes/xsctbit.bbclass b/classes/xsctbit.bbclass index b52ba622a131..b0f8762af08d 100644 --- a/classes/xsctbit.bbclass +++ b/classes/xsctbit.bbclass @@ -4,4 +4,4 @@ FILESEXTRAPATHS:append := ":${XLNX_SCRIPTS_DIR}" SRC_URI:append = " file://bitstream.tcl" -XSCTH_SCRIPT = "${WORKDIR}/bitstream.tcl" +XSCTH_SCRIPT = "${UNPACKDIR}/bitstream.tcl" diff --git a/classes/xsctdt.bbclass b/classes/xsctdt.bbclass index 93a8c05314ce..ab1fcf28655a 100644 --- a/classes/xsctdt.bbclass +++ b/classes/xsctdt.bbclass @@ -9,4 +9,4 @@ SRC_URI:append = " \ PACKAGE_ARCH ?= "${MACHINE_ARCH}" -XSCTH_SCRIPT = "${WORKDIR}/dtgen.tcl" +XSCTH_SCRIPT = "${UNPACKDIR}/dtgen.tcl" diff --git a/recipes-bsp/bitstream/bitstream-extraction_git.bb b/recipes-bsp/bitstream/bitstream-extraction_git.bb index b1bd466ff27c..7340c69cd640 100644 --- a/recipes-bsp/bitstream/bitstream-extraction_git.bb +++ b/recipes-bsp/bitstream/bitstream-extraction_git.bb @@ -11,6 +11,8 @@ PACKAGE_ARCH ?= "${MACHINE_ARCH}" inherit xsctbit deploy image-artifact-names +S = "${UNPACKDIR}" + XSCTH_MISC = "-hwpname ${XSCTH_PROJ}_hwproj -hdf_type ${HDF_EXT}" do_compile[noexec] = "1" diff --git a/recipes-bsp/bootbin/xilinx-bootbin_1.0.bbappend b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bbappend index e5b8f5cec32c..074f4c7548e4 100644 --- a/recipes-bsp/bootbin/xilinx-bootbin_1.0.bbappend +++ b/recipes-bsp/bootbin/xilinx-bootbin_1.0.bbappend @@ -2,6 +2,8 @@ BIF_BITSTREAM_ATTR ?= "${@bb.utils.contains('MACHINE_FEATURES', 'fpga-overlay', DEPENDS += 'u-boot-xlnx-scr' +S = "${UNPACKDIR}" + # Only adjust the depends when on versal BOOTSCR_DEP = '' BOOTSCR_DEP:versal = 'u-boot-xlnx-scr:do_deploy' diff --git a/recipes-bsp/embeddedsw/fsbl-firmware_2023.2.bbappend b/recipes-bsp/embeddedsw/fsbl-firmware_2023.2.bbappend index 98bc18570f08..32736ba15438 100644 --- a/recipes-bsp/embeddedsw/fsbl-firmware_2023.2.bbappend +++ b/recipes-bsp/embeddedsw/fsbl-firmware_2023.2.bbappend @@ -33,30 +33,30 @@ EXTRA_OEMAKE:linux-gnueabi = "" # Workaround for hardcoded toolchain items XSCT_PATH_ADD:append:elf = "\ -${WORKDIR}/bin:" +${UNPACKDIR}/bin:" XSCT_PATH_ADD:append:eabi = "\ -${WORKDIR}/bin:" +${UNPACKDIR}/bin:" do_compile:prepend:elf:aarch64() { - mkdir -p ${WORKDIR}/bin - echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/aarch64-none-elf-gcc - echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/aarch64-none-elf-as - echo "#! /bin/bash\n${AR} \$@" > ${WORKDIR}/bin/aarch64-none-elf-ar - chmod 0755 ${WORKDIR}/bin/aarch64-none-elf-gcc - chmod 0755 ${WORKDIR}/bin/aarch64-none-elf-as - chmod 0755 ${WORKDIR}/bin/aarch64-none-elf-ar + mkdir -p ${UNPACKDIR}/bin + echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/aarch64-none-elf-gcc + echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/aarch64-none-elf-as + echo "#! /bin/bash\n${AR} \$@" > ${UNPACKDIR}/bin/aarch64-none-elf-ar + chmod 0755 ${UNPACKDIR}/bin/aarch64-none-elf-gcc + chmod 0755 ${UNPACKDIR}/bin/aarch64-none-elf-as + chmod 0755 ${UNPACKDIR}/bin/aarch64-none-elf-ar } ARM_INSTRUCTION_SET:eabi:arm = "arm" do_compile:prepend:eabi:arm() { - mkdir -p ${WORKDIR}/bin - echo "#! /bin/bash\n${CC} \$@" > ${WORKDIR}/bin/arm-none-eabi-gcc - echo "#! /bin/bash\n${AS} \$@" > ${WORKDIR}/bin/arm-none-eabi-as - echo "#! /bin/bash\n${AR} \$@" > ${WORKDIR}/bin/arm-none-eabi-ar - chmod 0755 ${WORKDIR}/bin/arm-none-eabi-gcc - chmod 0755 ${WORKDIR}/bin/arm-none-eabi-as - chmod 0755 ${WORKDIR}/bin/arm-none-eabi-ar + mkdir -p ${UNPACKDIR}/bin + echo "#! /bin/bash\n${CC} \$@" > ${UNPACKDIR}/bin/arm-none-eabi-gcc + echo "#! /bin/bash\n${AS} \$@" > ${UNPACKDIR}/bin/arm-none-eabi-as + echo "#! /bin/bash\n${AR} \$@" > ${UNPACKDIR}/bin/arm-none-eabi-ar + chmod 0755 ${UNPACKDIR}/bin/arm-none-eabi-gcc + chmod 0755 ${UNPACKDIR}/bin/arm-none-eabi-as + chmod 0755 ${UNPACKDIR}/bin/arm-none-eabi-ar } # xsctapp sets it's own do_install, replace it with the real one (from meta-xilinx-standalone) diff --git a/recipes-bsp/hdf/external-hdf_2022.1.bb b/recipes-bsp/hdf/external-hdf_2022.1.bb index ef4224c5209b..29edf3a99acf 100644 --- a/recipes-bsp/hdf/external-hdf_2022.1.bb +++ b/recipes-bsp/hdf/external-hdf_2022.1.bb @@ -10,7 +10,7 @@ inherit deploy # HDF_BASE - file protocol # HDF_PATH - Path to git repository, or file in question -# HDF_NAME - Path to the XSA file once downloaded (must be inside WORKDIR) (See anon python) +# HDF_NAME - Path to the XSA file once downloaded (must be inside UNPACKDIR) (See anon python) HDF_BASE ??= "git://" HDF_PATH ??= "github.com/Xilinx/hdf-examples.git" HDF_NAME ??= "" @@ -34,9 +34,9 @@ include hdf-repository.inc 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 +# Don't set S = "${UNPACKDIR}/git" as we need this to work for other protocols # HDF_NAME will be adjusted to include /git if needed -S = "${WORKDIR}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-bsp/hdf/external-hdf_2022.2.bb b/recipes-bsp/hdf/external-hdf_2022.2.bb index ea674e8f4c3a..3f7fe9c3a119 100644 --- a/recipes-bsp/hdf/external-hdf_2022.2.bb +++ b/recipes-bsp/hdf/external-hdf_2022.2.bb @@ -10,7 +10,7 @@ inherit deploy # HDF_BASE - file protocol # HDF_PATH - Path to git repository, or file in question -# HDF_NAME - Path to the XSA file once downloaded (must be inside WORKDIR) (See anon python) +# HDF_NAME - Path to the XSA file once downloaded (must be inside UNPACKDIR) (See anon python) HDF_BASE ??= "git://" HDF_PATH ??= "github.com/Xilinx/hdf-examples.git" HDF_NAME ??= "" @@ -34,9 +34,9 @@ include hdf-repository.inc 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 +# Don't set S = "${UNPACKDIR}/git" as we need this to work for other protocols # HDF_NAME will be adjusted to include /git if needed -S = "${WORKDIR}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-bsp/hdf/external-hdf_2023.1.bb b/recipes-bsp/hdf/external-hdf_2023.1.bb index ec33d2d9a28f..c1d1bc759652 100644 --- a/recipes-bsp/hdf/external-hdf_2023.1.bb +++ b/recipes-bsp/hdf/external-hdf_2023.1.bb @@ -13,7 +13,7 @@ HDF_BASE[doc] = "Download protocol (file://, git://, http:// or https://)" HDF_PATH ??= "" HDF_PATH[doc] = "Path to git repository, or file" HDF_NAME ??= "" -HDF_NAME[doc] = "Path to the XSA file once downloaded, usually set by the recipe (must be inside WORKDIR) (See anon python)" +HDF_NAME[doc] = "Path to the XSA file once downloaded, usually set by the recipe (must be inside UNPACKDIR) (See anon python)" BRANCH ??= "" SRCREV ??= "" @@ -61,9 +61,9 @@ include hdf-repository-2023.1.inc 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 +# Don't set S = "${UNPACKDIR}/git" as we need this to work for other protocols # HDF_NAME will be adjusted to include /git if needed -S = "${WORKDIR}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-bsp/hdf/external-hdf_2023.2.bb b/recipes-bsp/hdf/external-hdf_2023.2.bb index 5bf405eb99e0..2f5700b00ab6 100644 --- a/recipes-bsp/hdf/external-hdf_2023.2.bb +++ b/recipes-bsp/hdf/external-hdf_2023.2.bb @@ -13,7 +13,7 @@ HDF_BASE[doc] = "Download protocol (file://, git://, http:// or https://)" HDF_PATH ??= "" HDF_PATH[doc] = "Path to git repository, or file" HDF_NAME ??= "" -HDF_NAME[doc] = "Path to the XSA file once downloaded, usually set by the recipe (must be inside WORKDIR) (See anon python)" +HDF_NAME[doc] = "Path to the XSA file once downloaded, usually set by the recipe (must be inside UNPACKDIR) (See anon python)" BRANCH ??= "" SRCREV ??= "" @@ -61,9 +61,9 @@ include hdf-repository_2023.2.inc 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 +# Don't set S = "${UNPACKDIR}/git" as we need this to work for other protocols # HDF_NAME will be adjusted to include /git if needed -S = "${WORKDIR}" +S = "${UNPACKDIR}" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/recipes-utils/mb-realoc/mb-realoc.bb b/recipes-utils/mb-realoc/mb-realoc.bb index 22b9984432fb..23a8a9d1fbad 100644 --- a/recipes-utils/mb-realoc/mb-realoc.bb +++ b/recipes-utils/mb-realoc/mb-realoc.bb @@ -15,7 +15,7 @@ ELF_LOAD_ADDR ?= "0" ELF_JUMP_OFFSET ?= "" ELF_INFILE ?= "${DEPLOY_DIR_IMAGE}/u-boot.elf" OUTFILE_NAME ?= "u-boot-s" -B = "${WORKDIR}" +B = "${UNPACKDIR}" PARALLEL_MAKE="" @@ -24,14 +24,14 @@ do_compile[depends] = "virtual/bootloader:do_deploy" do_compile() { export CROSS_COMPILE="${TARGET_PREFIX}" - ${WORKDIR}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME} + ${UNPACKDIR}/mb-realoc -l ${ELF_LOAD_ADDR} -i ${ELF_INFILE} -o ${OUTFILE_NAME} } do_install[noexec] = "1" do_deploy() { install -d ${DEPLOYDIR} - install -m 0644 ${WORKDIR}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin + install -m 0644 ${UNPACKDIR}/${OUTFILE_NAME}.bin ${DEPLOYDIR}/${OUTFILE_NAME}.bin } addtask deploy after do_compile -- 2.44.0.478.g7774cfed6261
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5355): https://lists.yoctoproject.org/g/meta-xilinx/message/5355 Mute This Topic: https://lists.yoctoproject.org/mt/106374653/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
