This patch allows the ti-cgt-pru recipe to build after oe-core's WORKDIR/UNPACKDIR cleanup.
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-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb | 8 ++++---- meta-ti-extras/recipes-ti/includes/ti-unpack.inc | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb index c96113fec7db..47bd6a51ef8f 100644 --- a/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb +++ b/meta-ti-extras/recipes-ti/devtools/ti-cgt-pru_2.3.3.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TI PRU Code Generation Tools" HOMEPAGE = "https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm"; LICENSE = "(TI-TSPA & Thai-Open-Source-Software-Center) & BSD-3-Clause & BSL-1.0 & Hewlett-Packard & AFL-3.0 & MIT & BSD-2-Clause & PD" -LIC_FILES_CHKSUM = "file://ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ti-cgt-pru_${PV}/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" LIC_FILES_CHKSUM:class-target = "file://usr/share/doc/ti/cgt-pru/PRU_Code_Generation_Tools_2.3.x_manifest.html;md5=e22f9d8240f7cca0c0aa5242d9ffa5bc" require recipes-ti/includes/ti-paths.inc @@ -10,7 +10,7 @@ require recipes-ti/includes/ti-unpack.inc BINFILE = "ti_cgt_pru_${PV}_linux_installer_x86.bin" BINFILE_NAME = "cgt-pru-x86" -TI_BIN_UNPK_ARGS = "--prefix ${S}" +TI_BIN_UNPK_ARGS = "--prefix ${UNPACKDIR}" TI_BIN_UNPK_CMDS = "" BINFILE:class-target = "ti_cgt_pru_${PV}_armlinuxa8hf_busybox_installer.sh" @@ -26,12 +26,12 @@ SRC_URI[cgt-pru-arm.sha256sum] = "8390cb77b46b728ce2940595b81406f76d86dfed58c212 do_install() { install -d ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE} - cp -r ${S}/ti-cgt-pru_${PV}/. \ + cp -r ${UNPACKDIR}/ti-cgt-pru_${PV}/. \ ${D}${TI_CGT_PRU_INSTALL_DIR_RECIPE}/ } do_install:class-target() { - ${WORKDIR}/${BINFILE} --prefix ${D} + ${UNPACKDIR}/${BINFILE} --prefix ${D} } FILES:${PN} += "${datadir}/ti/*" diff --git a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc index 13068843e60a..4cefefbfdbc8 100644 --- a/meta-ti-extras/recipes-ti/includes/ti-unpack.inc +++ b/meta-ti-extras/recipes-ti/includes/ti-unpack.inc @@ -5,7 +5,7 @@ # TI_BIN_UNPK_ARGS - contains the arguments to be passed to the bin file. # TI_BIN_UNPK_CMDS - contains list of commands separated with colon to be # passed while unpacking the bin file. The keyword -# workdir expands to WORKDIR and commands are appendded +# workdir expands to UNPACKDIR and commands are appendded # with '\n'. Eg. TI_BIN_UNPK_CMDS="Y:Y: qY:workdir" # TI_BIN_UNPK_WDEXT - This variable extends workdir path, if user wants to put # the output in some internal directory @@ -30,7 +30,7 @@ python ti_bin_do_unpack() { # Change to the working directory save_cwd = os.getcwd() - workdir = localdata.getVar('WORKDIR') + workdir = localdata.getVar('UNPACKDIR') workdir = bb.data.expand(workdir, localdata) os.chdir(workdir) -- 2.44.0.501.g19981daefd7c
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#17682): https://lists.yoctoproject.org/g/meta-ti/message/17682 Mute This Topic: https://lists.yoctoproject.org/mt/106313540/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
