From: Trevor Woerner <twoerner@gmail.com>
To: meta-ti@lists.yoctoproject.org
Subject: [PATCH] ti-cgt-pru: WORKDIR/UNPACKDIR cleanup
Date: Sun, 26 May 2024 09:15:57 -0400 [thread overview]
Message-ID: <20240526131557.10134-1-twoerner@gmail.com> (raw)
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 <twoerner@gmail.com>
---
| 8 ++++----
| 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
--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/*"
--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
reply other threads:[~2024-05-26 13:16 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240526131557.10134-1-twoerner@gmail.com \
--to=twoerner@gmail.com \
--cc=meta-ti@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.