[PATCH 1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir

* [PATCH 1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir
@ 2022-04-05 13:48 Ross Burton
  2022-04-05 13:48 ` [PATCH 2/2] arm-toolchain/tcmode-external-arm: skip gcc-cross-* Ross Burton
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Ross Burton @ 2022-04-05 13:48 UTC (permalink / raw)
  To: meta-arm

$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(-)

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
 }
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 5+ messages in thread