| Message ID | 20220405134810.1999000-1-ross.burton@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir | expand |
On Tue, 5 Apr 2022 14:48:09 +0100, Ross Burton wrote: > $datadir is for architecture-independent files, and a compiler is not > that. > > Install to $libexecdir, and clean up the installation commands whilst > there. Applied, thanks! [1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir commit: a92e076973506a1a7b1a5308370322ccd8e734bc [2/2] arm-toolchain/tcmode-external-arm: skip gcc-cross-* commit: faec9a7ad377e5b4a3e039e216dbb9c4093e45ed Best regards,
On Tue, 5 Apr 2022 14:48:09 +0100, Ross Burton wrote: > $datadir is for architecture-independent files, and a compiler is not > that. > > Install to $libexecdir, and clean up the installation commands whilst > there. Applied, thanks! [1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir commit: a92e076973506a1a7b1a5308370322ccd8e734bc [2/2] arm-toolchain/tcmode-external-arm: skip gcc-cross-* commit: faec9a7ad377e5b4a3e039e216dbb9c4093e45ed Best regards,
diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc index da12a778..1fa4cd3e 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/arm-binary-toolchain.inc @@ -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 } diff --git a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb index 65a1f3a5..938dbc2c 100644 --- a/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb +++ b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/armcompiler_6.17.bb @@ -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 }
$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> --- .../external-arm-toolchain/arm-binary-toolchain.inc | 9 ++++----- .../external-arm-toolchain/armcompiler_6.17.bb | 7 +++---- 2 files changed, 7 insertions(+), 9 deletions(-)