From patchwork Tue Apr 5 13:48:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 6309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53E3BC46467 for ; Tue, 5 Apr 2022 17:24:47 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web12.6550.1649166493848027379 for ; Tue, 05 Apr 2022 06:48:14 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A7A8E1474 for ; Tue, 5 Apr 2022 06:48:12 -0700 (PDT) Received: from oss-tx204.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 577413F5A1 for ; Tue, 5 Apr 2022 06:48:12 -0700 (PDT) From: Ross Burton To: meta-arm@lists.yoctoproject.org Subject: [PATCH 1/2] arm-toolchain/external-arm-toolchain: install to libexecdir not datadir Date: Tue, 5 Apr 2022 14:48:09 +0100 Message-Id: <20220405134810.1999000-1-ross.burton@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 05 Apr 2022 17:24:47 -0000 X-Groupsio-URL: https://lists.yoctoproject.org/g/meta-arm/message/3239 $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 --- .../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[\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 }