mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-04-20 11:29:54 +00:00
Code Issues Projects Releases Wiki Activity

arm-toolchain/external-arm-toolchain: install to libexecdir not datadir

Browse Source 
$datadir is for architecture-independent files, and a compiler is not
that.

Install to $libexecdir, and clean up the installation commands whilst
there.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2022-04-05 14:48:09 +01:00
committed by Jon Mason
parent 5c83fa8364
commit a92e076973
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc
View File

@@ -1,16 +1,15 @@
INHIBIT_DEFAULT_DEPS = "1"
FILES:${PN} = "${datadir} ${bindir}"
FILES:${PN} = "${libexecdir} ${bindir}"
BINNAME = "${@d.getVar("BPN").strip("gcc-")}"
do_install() {
install -d ${D}${datadir}/${BINNAME}/
cp -r ${S}/. ${D}${datadir}/
install -d ${D}${bindir} ${D}${libexecdir}/${BPN}/
cp -r ${S}/. ${D}${libexecdir}/${BPN}
install -d ${D}${bindir}
# Symlink all executables into bindir
for f in ${D}${datadir}/bin/${BINNAME}-*; do
for f in ${D}${libexecdir}/${BPN}/bin/*; do
ln -rs $f ${D}${bindir}/$(basename $f)
done
}

7
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb
View File

@@ -44,13 +44,12 @@ UPSTREAM_CHECK_REGEX = "Download Arm Compiler.*,(?P<pver>[\d\.]+)"
S = "${WORKDIR}/${ARMCLANG_VERSION}"
do_install() {
install -d ${D}${datadir}/armclang/
install -d ${D}${bindir} ${D}${libexecdir}/${BPN}/
# Commercial license flag set, so recipe will only install when explicitly agreed to it already
${S}/install_x86_64.sh --i-agree-to-the-contained-eula -d ${D}${datadir}/armclang/ --no-interactive
${S}/install_x86_64.sh --i-agree-to-the-contained-eula -d ${D}${libexecdir}/${BPN}/ --no-interactive
install -d ${D}${bindir}
# Symlink all executables into bindir
for f in ${D}${datadir}/armclang/bin/*; do
for f in ${D}${libexecdir}/${BPN}/bin/*; do
ln -rs $f ${D}${bindir}/$(basename $f)
done
}