From 4017b1fb18dc59d108e880315c28f10d93058f8c Mon Sep 17 00:00:00 2001 From: Corey Thompson Date: Mon, 2 May 2022 13:56:52 -0400 Subject: extract-cdo: Avoid directly populating ${DEPLOY_DIR_IMAGE} This creates problems when images are deployed from sstate cache. Avoid it by extracting the xilinx-bootbin boot.bin file into the extract-cdo build dir ${B}. Then deploy from the output from ${B}. (Original commit submitted by Corey Thompson ) Commit adjusted to change extraction directory vs copying the boot.bin. Update the summary to better reflect what this is doing, as well as the do_compile comment. Disable (noexec) the do_install as this isn't a target package. Signed-off-by: Mark Hatle --- meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'meta-xilinx-core/recipes-bsp/cdo') diff --git a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb index 37c284ad..8b1e52ac 100644 --- a/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb +++ b/meta-xilinx-core/recipes-bsp/cdo/extract-cdo_1.0.bb @@ -1,4 +1,4 @@ -DESCRIPTION = "Recipe to copy external cdos" +DESCRIPTION = "Recipe to extract pmc_cdo for qemu usage" LICENSE = "CLOSED" @@ -21,14 +21,19 @@ BOOTGEN_CMD ?= "bootgen" BOOTGEN_ARGS ?= "-arch versal" BOOTGEN_OUTFILE ?= "${DEPLOY_DIR_IMAGE}/boot.bin" -#The following line creates the pmc_cdo.bin file at the same dir as the boot.bin which is DEPLOY_DIR_IMAGE +# bootgen extracts the pmc_cdo file from the boot.bin. By default this +# happens in the same directory as the boot.bin. We need to move it to +# this directory, as do_compile should never write into a deploy dir do_compile() { - ${BOOTGEN_CMD} ${BOOTGEN_ARGS} -dump ${BOOTGEN_OUTFILE} pmc_cdo + ${BOOTGEN_CMD} ${BOOTGEN_ARGS} -dump_dir ${B} -dump ${BOOTGEN_OUTFILE} pmc_cdo } +do_install[noexec] = '1' + do_deploy() { install -d ${DEPLOYDIR}/CDO - install -m 0644 ${DEPLOY_DIR_IMAGE}/pmc_cdo.bin ${DEPLOYDIR}/CDO/pmc_cdo.bin + install -m 0644 ${B}/pmc_cdo.bin ${DEPLOYDIR}/CDO/pmc_cdo.bin + install -m 0644 ${B}/pmc_cdo.bin ${DEPLOYDIR}/pmc_cdo.bin } -addtask do_deploy after do_install +addtask do_deploy after do_compile -- cgit v1.2.3-54-g00ecf