1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-02 01:20:09 +00:00

arm-toolchain/armcompiler: fix checksums and installation on arm64

The tarball has been regenerated with new license texts, so the
checksums are different.

Also, patch out the host architecture test in the installer: we might
want to package the armcompiler for a x86 target on a arm64 machine.

Change-Id: Iedf0113c53b6567e3e4e716e2a0db98776d1da6d
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2021-07-07 10:22:17 +01:00
committed by Jon Mason
parent 40e3391fa5
commit 339420ae77
2 changed files with 19 additions and 5 deletions
@@ -0,0 +1,14 @@
The install script has an explicit check that the current host is x86-64, which
means we can't build armcompiler for x86-64 targets on arm64. Pad the
replacement host with whitespace so that the installer offset doesn't change.
Upstream-Status: Inappropriate
Signed-off-by: Ross Burton <ross.burton@arm.com>
--- a/install_x86_64.sh.orig 2021-07-06 14:11:47.632155370 +0100
+++ b/install_x86_64.sh 2021-07-06 14:11:58.393163350 +0100
@@ -470,3 +470,3 @@
fi
-host=`/bin/uname -m`
+host=x86_64
echo --- Host target check...[${host}]
@@ -17,18 +17,18 @@ LICENSE = "Armcompiler-License-agreement & Armcompiler-Redistributables & \
Armcompiler-Supplementary-terms & Armcompiler-Third-party-licenses" Armcompiler-Supplementary-terms & Armcompiler-Third-party-licenses"
LICENSE_FLAGS = "armcompiler" LICENSE_FLAGS = "armcompiler"
LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=40cd57dbb1f9d111fb6923945849d51c \ LIC_FILES_CHKSUM = "file://license_terms/license_agreement.txt;md5=19faf912b534478d28f60dfa24659c17 \
file://license_terms/redistributables.txt;md5=e510e47f7f5be1356ea6218f5b1f6c55 \ file://license_terms/redistributables.txt;md5=e510e47f7f5be1356ea6218f5b1f6c55 \
file://license_terms/supplementary_terms.txt;md5=17a2efdbd320ceda48a3521747e02dd9 \ file://license_terms/supplementary_terms.txt;md5=17a2efdbd320ceda48a3521747e02dd9 \
file://license_terms/third_party_licenses.txt;md5=6273fa29eb26c0093e1a7deaef7bafec " file://license_terms/third_party_licenses.txt;md5=c351a9bed613cf88d4fccd6f0a5e57af "
ARMCLANG_VERSION = "DS500-BN-00026-r5p0-18rel0" ARMCLANG_VERSION = "DS500-BN-00026-r5p0-18rel0"
COMPATIBLE_HOST = "x86_64.*-linux" COMPATIBLE_HOST = "x86_64.*-linux"
SRC_URI = "https://developer.arm.com/-/media/Files/downloads/compiler/${ARMCLANG_VERSION}.tgz;subdir=${ARMCLANG_VERSION}" SRC_URI = "https://developer.arm.com/-/media/Files/downloads/compiler/${ARMCLANG_VERSION}.tgz;subdir=${ARMCLANG_VERSION} \
SRC_URI[md5sum] = "d41d8cd98f00b204e9800998ecf8427e" file://no-uname.patch"
SRC_URI[sha256sum] = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" SRC_URI[sha256sum] = "d9fb99e7550366f884c31f74953066da64301fb30601cb55278d738459c22557"
UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/" UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/embedded/arm-compiler/downloads/"
UPSTREAM_CHECK_REGEX = "Download Arm Compiler.*,(?P<pver>[\d\.]+)" UPSTREAM_CHECK_REGEX = "Download Arm Compiler.*,(?P<pver>[\d\.]+)"