arm-toolchain: upgrade toolchains to 11.2-2002.02
RFC 1/1 arm-toolchain: upgrade toolchains to 11.2-2002.02
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
---
ci/get-binary-toolchains | 13 ++++++----
...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------
.../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ----------------
.../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++
4 files changed, 39 insertions(+), 32 deletions(-)
rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%)
delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb
create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbci/get-binary-toolchains +8 -5
@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2
@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7 -7
@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0 -20
@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24 -0
@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Signature · 1 line
2.30.2
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>
Quoted 9 lines
---
ci/get-binary-toolchains | 13 ++++++----
...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------
.../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ----------------
.../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++
4 files changed, 39 insertions(+), 32 deletions(-)
rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%)
delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb
create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 129 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-0@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"Signature · 1 line
2.30.2
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
After a minor change and using -M25%
ci/get-binary-toolchains +1 -2
@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2
@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+
+ #AArch64 GNU/Linux target (aarch64-none-linux-gnu)
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers
#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1
(quoted diff) +0 -0
b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb similarity index 61%
rename from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb rename to meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb index 02b5b43bdd7e..a9e6b581a50e 100644
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0 -1
@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 =
"file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
-PROVIDES = "virtual/aarch64-none-elf-gcc"
+PROVIDES = "virtual/${BINNAME}-gcc"
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] =
"768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f"
-SRC_URI[gnu-a-x86_64.sha256sum] =
"6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] =
"3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c"
+SRC_URI[gnu-a-x86_64.sha256sum] =
"b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"
S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
(quoted diff) +0 -0
b/meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb similarity index 35%
rename from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb rename to meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb index ad7e81617d74..930bb5261be8 100644
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0 -1
@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM =
"file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
-PROVIDES = "virtual/arm-none-eabi-gcc"
+PROVIDES = "virtual/${BINNAME}-gcc"
-SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] =
"f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208"
-SRC_URI[gnu-rm-x86_64.sha256sum] =
"97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"
+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] =
"dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970"
+SRC_URI[gnu-rm-x86_64.sha256sum] =
"8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"
+S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
+
+UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 158 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 127 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --Quoted 2 lines
2.30.2
--
Regards,
Denys Dmytriyenko <[email protected]>
PGP:0x420902729A92C964- https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Denys Dmytriyenko
Reviewed-byQuoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Quoted 305 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 158 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 127 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --Quoted 2 lines
2.30.2
--
Regards,
Denys Dmytriyenko <[email protected]>
PGP:0x420902729A92C964- https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Signature · 4 lines
Regards, Denys Dmytriyenko <[email protected]> PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964 Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Quoted 10 lines · Denys Dmytriyenko
Quoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Reviewed-by Denys Dmytriyenko <[email protected]>
If only this one worked. I'm still seeing the error with do_install
https://gitlab.com/jonmason00/meta-arm/-/jobs/2236954115
And no actual error in the log, and I'm not sure where to begin debugging it without an error in the log. You can pull the code down from my gitlab
https://gitlab.com/jonmason00/meta-arm/
branch dev3
I would really appreciate your reviewed-by for the other patch (as I can actually confirm it works in our CI, and I'd like to get it in before the code freeze at the end of the month).
https://lists.yoctoproject.org/g/meta-arm/message/3191
Thanks,
Jon
Quoted 311 lines
Quoted 145 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 160 lines
Quoted 158 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 127 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --Quoted 2 lines
2.30.2
--
Regards,
Denys Dmytriyenko <[email protected]>
PGP:0x420902729A92C964- https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964--
Regards,
Denys Dmytriyenko <[email protected]>
PGP:0x420902729A92C964- https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186 6D76 4209 0272 9A92 C964
Quoted 11 lines · Jon Mason
Quoted 10 lines · Denys Dmytriyenko
Quoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Reviewed-by Denys Dmytriyenko <[email protected]>
I have to retract my Reviewed-by, as the patch seems incorrect.
Quoted 9 lines
If only this one worked. I'm still seeing the error with
do_install
https://gitlab.com/jonmason00/meta-arm/-/jobs/2236954115And no actual error in the log, and I'm not sure where to begin debugging it without an error in the log. You can pull the code down from my gitlab
https://gitlab.com/jonmason00/meta-arm/
branch dev3
Quoted 4 lines
I would really appreciate your reviewed-by for the other patch (as I can actually confirm it works in our CI, and I'd like to get it in before the code freeze at the end of the month).
https://lists.yoctoproject.org/g/meta-arm/message/3191
Here's the thing - you are updating baremetal toolchain recipes, which download their release tarballs on their own and not by CI.
You are also changing CI part that downloads Linux toolchain used by external-toolchain, not by baremetal toolchains.
So, you are feeding newer 11.2 Linux toolchain release to external-toolchain recipe that might need updating also due to subtle changes in their release structure.
There are 3 different types of toolchains in meta-arm-toolchain:
1. ARM Linux toolchain built from sources, then used to build the rest of the Linux system - recipes-devtool/gcc
2. ARM Linux toolchain using prebuilt binaries, expects those binaries to exist on the host (downloaded by CI) and the recipe then scrapes required pieces into sysroot, which then used to build the rest of the Linux system - recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
3. ARM baremetal toolchains used to build firmware and non-Linux components, recipes are self-contained and download their binaries on their own - recipes-devtools/external-arm-toolchain/gcc-$arch-none-{elf/eabi}_*.bb
All 3 are independent of each other and have no re-use between them, as they are different. And thus can have different versions. #1 and #2 are mutually exclusive, as that's your main Linux toolchain. #3 can co-exist with either one of those two as it's for baremetal components.
So, Sumit's first patch updated #1 - source Linux toolchain. His second patch tried to update CI for #2 - external prebuilt Linux toolchain. That's where the error is coming from.
You then re-spinned the patch and besides updating CI for #2 toolchain, also bumped up #3 baremetal toolchains. The error is still there though and is in external prebuilt Linux toolchain (#2), not in baremetal toolchains (#3).
As I said earlier, it seems external-arm-toolchain also needs some adjustments for 11.2 besides pulling new tarballs in CI.
I might be able to find some time and look into fixing external-arm-toolchain to work with 11.2 prebuilt binary release in the next couple days. Worst case scenario - split your patch and only merge baremetal update, leaving CI at 10.3 for now for external-arm-toolchain...
PS. it appears Patchwork is missing some patches, specifically both Sumit's first version to update #1, as well as your second re-spin for the same. Wonder if it's due to the patch size...
Signature · 1 line
Denys
Quoted 297 lines
Quoted 297 lines
Quoted 297 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 151 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 128 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --2.30.2
Hi Denys and Jon,
Quoted 43 lines · Denys Dmytriyenko
Quoted 11 lines · Jon Mason
Quoted 10 lines · Denys Dmytriyenko
Quoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Reviewed-by Denys Dmytriyenko <[email protected]>I have to retract my Reviewed-by, as the patch seems incorrect.
Quoted 9 lines
If only this one worked. I'm still seeing the error with
do_install
https://gitlab.com/jonmason00/meta-arm/-/jobs/2236954115And no actual error in the log, and I'm not sure where to begin debugging it without an error in the log. You can pull the code down from my gitlab
https://gitlab.com/jonmason00/meta-arm/
branch dev3Quoted 4 lines
I would really appreciate your reviewed-by for the other patch (as I can actually confirm it works in our CI, and I'd like to get it in before the code freeze at the end of the month).
https://lists.yoctoproject.org/g/meta-arm/message/3191Here's the thing - you are updating baremetal toolchain recipes, which download their release tarballs on their own and not by CI.
You are also changing CI part that downloads Linux toolchain used by external-toolchain, not by baremetal toolchains.
So, you are feeding newer 11.2 Linux toolchain release to external-toolchain recipe that might need updating also due to subtle changes in their release structure.
There are 3 different types of toolchains in meta-arm-toolchain:
Quoted 7 lines
1. ARM Linux toolchain built from sources, then used to build the rest of the Linux system - recipes-devtool/gcc
2. ARM Linux toolchain using prebuilt binaries, expects those binaries to exist on the host (downloaded by CI) and the recipe then scrapes required pieces into sysroot, which then used to build the rest of the Linux system - recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
Earlier I guessed that it should work without any changes but it looks like GNU-A and GNU-RM merge led to significant changes in libc packaging, see below.
Quoted 19 lines
3. ARM baremetal toolchains used to build firmware and non-Linux components, recipes are self-contained and download their binaries on their own - recipes-devtools/external-arm-toolchain/gcc-$arch-none-{elf/eabi}_*.bb
All 3 are independent of each other and have no re-use between them, as they are different. And thus can have different versions. #1 and #2 are mutually exclusive, as that's your main Linux toolchain. #3 can co-exist with either one of those two as it's for baremetal components.
So, Sumit's first patch updated #1 - source Linux toolchain. His second patch tried to update CI for #2 - external prebuilt Linux toolchain. That's where the error is coming from.
You then re-spinned the patch and besides updating CI for #2 toolchain, also bumped up #3 baremetal toolchains. The error is still there though and is in external prebuilt Linux toolchain (#2), not in baremetal toolchains (#3).
Quoted 5 lines
As I said earlier, it seems external-arm-toolchain also needs some adjustments for 11.2 besides pulling new tarballs in CI.
I might be able to find some time and look into fixing external-arm-toolchain to work with 11.2 prebuilt binary release in the next couple days.
It looks like there have been a lot of changes to how glibc is packaged into the toolchain. As an example we can no longer find any symlinks to "lib*-${EAT_VER_LIBC}.so" in 11.2 prebuilt toolchain. So I will try to add corresponding support but it may take time with testing involved.
Quoted 3 lines
Worst case
scenario - split your patch and only merge baremetal update, leaving CI at 10.3 for now for external-arm-toolchain...
We should go ahead with this strategy.
-Sumit
Quoted 307 lines
PS. it appears Patchwork is missing some patches, specifically both Sumit's first version to update #1, as well as your second re-spin for the same. Wonder if it's due to the patch size...
--
DenysQuoted 297 lines
Quoted 297 lines
Quoted 297 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 151 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 128 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --2.30.2
Quoted 89 lines · Sumit Garg
Hi Denys and Jon,
Quoted 43 lines · Denys Dmytriyenko
Quoted 11 lines · Jon Mason
Quoted 10 lines · Denys Dmytriyenko
Quoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Reviewed-by Denys Dmytriyenko <[email protected]>I have to retract my Reviewed-by, as the patch seems incorrect.
Quoted 9 lines
If only this one worked. I'm still seeing the error with
do_install
https://gitlab.com/jonmason00/meta-arm/-/jobs/2236954115And no actual error in the log, and I'm not sure where to begin debugging it without an error in the log. You can pull the code down from my gitlab
https://gitlab.com/jonmason00/meta-arm/
branch dev3Quoted 4 lines
I would really appreciate your reviewed-by for the other patch (as I can actually confirm it works in our CI, and I'd like to get it in before the code freeze at the end of the month).
https://lists.yoctoproject.org/g/meta-arm/message/3191Here's the thing - you are updating baremetal toolchain recipes, which download their release tarballs on their own and not by CI.
You are also changing CI part that downloads Linux toolchain used by external-toolchain, not by baremetal toolchains.
So, you are feeding newer 11.2 Linux toolchain release to external-toolchain recipe that might need updating also due to subtle changes in their release structure.
There are 3 different types of toolchains in meta-arm-toolchain:
Quoted 7 lines
1. ARM Linux toolchain built from sources, then used to build the rest of the Linux system - recipes-devtool/gcc
2. ARM Linux toolchain using prebuilt binaries, expects those binaries to exist on the host (downloaded by CI) and the recipe then scrapes required pieces into sysroot, which then used to build the rest of the Linux system - recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
Earlier I guessed that it should work without any changes but it looks like GNU-A and GNU-RM merge led to significant changes in libc packaging, see below.
Quoted 19 lines
3. ARM baremetal toolchains used to build firmware and non-Linux components, recipes are self-contained and download their binaries on their own - recipes-devtools/external-arm-toolchain/gcc-$arch-none-{elf/eabi}_*.bb
All 3 are independent of each other and have no re-use between them, as they are different. And thus can have different versions. #1 and #2 are mutually exclusive, as that's your main Linux toolchain. #3 can co-exist with either one of those two as it's for baremetal components.
So, Sumit's first patch updated #1 - source Linux toolchain. His second patch tried to update CI for #2 - external prebuilt Linux toolchain. That's where the error is coming from.
You then re-spinned the patch and besides updating CI for #2 toolchain, also bumped up #3 baremetal toolchains. The error is still there though and is in external prebuilt Linux toolchain (#2), not in baremetal toolchains (#3).
Quoted 5 lines
As I said earlier, it seems external-arm-toolchain also needs some adjustments for 11.2 besides pulling new tarballs in CI.
I might be able to find some time and look into fixing external-arm-toolchain to work with 11.2 prebuilt binary release in the next couple days.
It looks like there have been a lot of changes to how glibc is packaged into the toolchain. As an example we can no longer find any symlinks to "lib*-${EAT_VER_LIBC}.so" in 11.2 prebuilt toolchain. So I will try to add corresponding support but it may take time with testing involved.
Quoted 5 lines
Quoted 3 lines
Worst case
scenario - split your patch and only merge baremetal update, leaving CI at 10.3 for now for external-arm-toolchain...We should go ahead with this strategy.
I would very much like both of the toolchains at the same version, but I understand this might not be possible with release schedules being what they are and the need for testing. While waiting for this, we'll stick with the split.
I appreciate everyone trying to get this done and I'm happy to help in any way I can.
Thanks,
Jon
Quoted 311 lines
-Sumit
Quoted 307 lines
PS. it appears Patchwork is missing some patches, specifically both Sumit's first version to update #1, as well as your second re-spin for the same. Wonder if it's due to the patch size...
--
DenysQuoted 297 lines
Quoted 297 lines
Quoted 297 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 151 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 128 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --2.30.2
Hi Jon,
Quoted 95 lines · Jon Mason
Quoted 93 lines · Sumit Garg
Hi Denys and Jon,
Quoted 43 lines · Denys Dmytriyenko
Quoted 11 lines · Jon Mason
Quoted 10 lines · Denys Dmytriyenko
Quoted 1 line · Jon Mason
After a minor change and using -M25%
Thanks! The patch is obviously malformed as it was sent as a reply, but otherwise looks good to me.
Feel free to add to the real patch:
Reviewed-by Denys Dmytriyenko <[email protected]>I have to retract my Reviewed-by, as the patch seems incorrect.
Quoted 9 lines
If only this one worked. I'm still seeing the error with
do_install
https://gitlab.com/jonmason00/meta-arm/-/jobs/2236954115And no actual error in the log, and I'm not sure where to begin debugging it without an error in the log. You can pull the code down from my gitlab
https://gitlab.com/jonmason00/meta-arm/
branch dev3Quoted 4 lines
I would really appreciate your reviewed-by for the other patch (as I can actually confirm it works in our CI, and I'd like to get it in before the code freeze at the end of the month).
https://lists.yoctoproject.org/g/meta-arm/message/3191Here's the thing - you are updating baremetal toolchain recipes, which download their release tarballs on their own and not by CI.
You are also changing CI part that downloads Linux toolchain used by external-toolchain, not by baremetal toolchains.
So, you are feeding newer 11.2 Linux toolchain release to external-toolchain recipe that might need updating also due to subtle changes in their release structure.
There are 3 different types of toolchains in meta-arm-toolchain:
Quoted 7 lines
1. ARM Linux toolchain built from sources, then used to build the rest of the Linux system - recipes-devtool/gcc
2. ARM Linux toolchain using prebuilt binaries, expects those binaries to exist on the host (downloaded by CI) and the recipe then scrapes required pieces into sysroot, which then used to build the rest of the Linux system - recipes-devtools/external-arm-toolchain/external-arm-toolchain.bb
Earlier I guessed that it should work without any changes but it looks like GNU-A and GNU-RM merge led to significant changes in libc packaging, see below.
Quoted 19 lines
3. ARM baremetal toolchains used to build firmware and non-Linux components, recipes are self-contained and download their binaries on their own - recipes-devtools/external-arm-toolchain/gcc-$arch-none-{elf/eabi}_*.bb
All 3 are independent of each other and have no re-use between them, as they are different. And thus can have different versions. #1 and #2 are mutually exclusive, as that's your main Linux toolchain. #3 can co-exist with either one of those two as it's for baremetal components.
So, Sumit's first patch updated #1 - source Linux toolchain. His second patch tried to update CI for #2 - external prebuilt Linux toolchain. That's where the error is coming from.
You then re-spinned the patch and besides updating CI for #2 toolchain, also bumped up #3 baremetal toolchains. The error is still there though and is in external prebuilt Linux toolchain (#2), not in baremetal toolchains (#3).
Quoted 5 lines
As I said earlier, it seems external-arm-toolchain also needs some adjustments for 11.2 besides pulling new tarballs in CI.
I might be able to find some time and look into fixing external-arm-toolchain to work with 11.2 prebuilt binary release in the next couple days.
It looks like there have been a lot of changes to how glibc is packaged into the toolchain. As an example we can no longer find any symlinks to "lib*-${EAT_VER_LIBC}.so" in 11.2 prebuilt toolchain. So I will try to add corresponding support but it may take time with testing involved.
Quoted 3 lines
Worst case
scenario - split your patch and only merge baremetal update, leaving CI at 10.3 for now for external-arm-toolchain...
Quoted 6 lines
Quoted 1 line
We should go ahead with this strategy.
I would very much like both of the toolchains at the same version, but I understand this might not be possible with release schedules being what they are and the need for testing. While waiting for this, we'll stick with the split.
Now I am done with the changes involved to support 11.2 binary toolchain along with testing. Here [1] [2] are corresponding patches.
[1] https://lists.yoctoproject.org/g/meta-arm/message/3322
[2] https://lists.yoctoproject.org/g/meta-arm/message/3323
Quoted 3 lines
I appreciate everyone trying to get this done and I'm happy to help in any way I can.
Thanks for your offer, really appreciated.
-Sumit
Quoted 315 lines
Thanks,
JonQuoted 311 lines
-Sumit
Quoted 307 lines
PS. it appears Patchwork is missing some patches, specifically both Sumit's first version to update #1, as well as your second re-spin for the same. Wonder if it's due to the patch size...
--
DenysQuoted 297 lines
Quoted 297 lines
Quoted 297 lines
ci/get-binary-toolchains +1
-2@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xzci/get-binary-toolchains +3
-0+ + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nchttps://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
elif [ $HOST_ARCH = "x86_64" ]; then
#x86_64 Linux hosted cross compilers#AArch32 target with hard float (arm-linux-none-gnueabihf)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz#AArch64 GNU/Linux target (aarch64-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz#AArch64 GNU/Linux target (aarch64_be-none-linux-gnu)
- wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
+ wget -P $DOWNLOAD_DIR -nc
https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz
else
echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +0
-1@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +1
-3-PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] ="
768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] ="
3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b"S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}"
-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads"
UPSTREAM_CHECK_REGEX= "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +0
-1@@ -8,13 +8,17 @@ COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" -LIC_FILES_CHKSUM ="file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 ="file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +1
-3-PROVIDES = "virtual/arm-none-eabi-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] ="
f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +2
-0+SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] ="
dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326"-UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads"
meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb +3
-1-UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+" +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI ="https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"
Quoted 151 lines · Denys Dmytriyenko
Quoted 7 lines · Jon Mason
There is a new and unified version of the toolchains (no longer the RM and A toolchain split). Update the paths and SHAs to reflect the new location.
NOTE: with this change, the binary toolchains do not appear to work
Signed-off-by Jon Mason <[email protected]>Quoted 9 lines
--- ci/get-binary-toolchains | 13 ++++++---- ...b => gcc-aarch64-none-elf_11.2-2022.02.bb} | 14 +++++------ .../gcc-arm-none-eabi_10.3-2021.10.bb | 20 ---------------- .../gcc-arm-none-eabi_11.2-2022.02.bb | 24 +++++++++++++++++++ 4 files changed, 39 insertions(+), 32 deletions(-) rename meta-arm-toolchain/recipes-devtools/external-arm-toolchain/{gcc-aarch64-none-elf_10.3-2021.07.bb => gcc-aarch64-none-elf_11.2-2022.02.bb} (61%) delete mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb create mode 100644 meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bbAny chance to lower the similarity threshold to make it a diff for review, instead of remove/add?
Quoted 128 lines
ci/get-binary-toolchains +8
-5@@ -2,7 +2,7 @@ set -u HOST_ARCH=$(uname -m) -VER="10.3-2021.07" +VER="11.2-2022.02" DOWNLOAD_DIR=$1 TOOLCHAIN_DIR=$2@@ -15,18 +15,21 @@ if [ $HOST_ARCH = "aarch64" ]; then #AArch64 Linux hosted cross compilers #AArch32 target with hard float (arm-none-linux-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + + #AArch64 GNU/Linux target (aarch64-none-linux-gnu) + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz elif [ $HOST_ARCH = "x86_64" ]; then #x86_64 Linux hosted cross compilers #AArch32 target with hard float (arm-linux-none-gnueabihf) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-arm-none-linux-gnueabihf.tar.xz #AArch64 GNU/Linux target (aarch64-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64-none-linux-gnu.tar.xz #AArch64 GNU/Linux target (aarch64_be-none-linux-gnu) - wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu-a/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz + wget -P $DOWNLOAD_DIR -nc https://developer.arm.com/-/media/Files/downloads/gnu/$VER/binrel/gcc-arm-$VER-$HOST_ARCH-aarch64_be-none-linux-gnu.tar.xz else echo "ERROR - Unknown build arch of $HOST_ARCH" exit 1meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_11.2-2022.02.bb renamed from meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-aarch64-none-elf_10.3-2021.07.bb +7
-7@@ -9,16 +9,16 @@ SUMMARY = "Baremetal GCC for Aarch64 processors" LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" -LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=d06ace534ed0851debcb7140c5b5116e" -LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=e4bcb5bee0c4a50c06704b0b73fcbe0c" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" -PROVIDES = "virtual/aarch64-none-elf-gcc" +PROVIDES = "virtual/${BINNAME}-gcc" -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-a/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" -SRC_URI[gnu-a-aarch64.sha256sum] = "768a5db41d93f48838f1c4bfeae26930df2320c09f0dfa798321082fb937955f" -SRC_URI[gnu-a-x86_64.sha256sum] = "6f74b1ee370caeb716688d2e467e5b44727fdc0ed56023fe5c72c0620019ecef" +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-a-${HOST_ARCH}" +SRC_URI[gnu-a-aarch64.sha256sum] = "3b15725545a0211a17b63e72d4f10241f7ffbe7ce94cb9612590ceacde16992c" +SRC_URI[gnu-a-x86_64.sha256sum] = "b0a015a9e8cbb44ed2fe5ad755a7a7ae254d54f93df3bf47378485b0ba8b828b" S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads" +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_10.3-2021.10.bb deleted +0
-20@@ -1,20 +0,0 @@ -# Copyright (C) 2019 Garmin Ltd. or its subsidiaries -# Released under the MIT license (see COPYING.MIT for the terms) - -require arm-binary-toolchain.inc - -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" - -SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" -LICENSE = "GPL-3.0-with-GCC-exception & GPL-3.0-only" - -LIC_FILES_CHKSUM = "file://share/doc/gcc-arm-none-eabi/license.txt;md5=c18349634b740b7b95f2c2159af888f5" - -PROVIDES = "virtual/arm-none-eabi-gcc" - -SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu-rm/${PV}/${BP}-${HOST_ARCH}-linux.tar.bz2;name=gnu-rm-${HOST_ARCH}" -SRC_URI[gnu-rm-aarch64.sha256sum] = "f605b5f23ca898e9b8b665be208510a54a6e9fdd0fa5bfc9592002f6e7431208" -SRC_URI[gnu-rm-x86_64.sha256sum] = "97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3" - -UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-rm/downloads" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>.+)-${HOST_ARCH}-linux\.tar\.\w+"meta-arm-toolchain/recipes-devtools/external-arm-toolchain/gcc-arm-none-eabi_11.2-2022.02.bb new file +24
-1@@ -0,0 +1,24 @@ +# Copyright (C) 2019 Garmin Ltd. or its subsidiaries +# Released under the MIT license (see COPYING.MIT for the terms) + +require arm-binary-toolchain.inc + +COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" + +SUMMARY = "Baremetal GCC for ARM-R and ARM-M processors" +LICENSE = "GPL-3.0-with-GCC-exception & GPLv3" + +LIC_FILES_CHKSUM = "${@d.getVar(d.expand("LIC_FILES_CHKSUM_${HOST_ARCH}"))}" +LIC_FILES_CHKSUM:aarch64 = "file://share/doc/gcc/Copying.html;md5=be4f8b5ff7319cd54f6c52db5d6f36b0" +LIC_FILES_CHKSUM:x86-64 = "file://share/doc/gcc/Copying.html;md5=1f07179249795891179bb3798bac7887" + +PROVIDES = "virtual/${BINNAME}-gcc" + +SRC_URI = "https://developer.arm.com/-/media/Files/downloads/gnu/${PV}/binrel/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}.tar.xz;name=gnu-rm-${HOST_ARCH}" +SRC_URI[gnu-rm-aarch64.sha256sum] = "dd861d188f4061a7ef3857c948376f84ef1dfb88a32aded7c336ed7e47e60970" +SRC_URI[gnu-rm-x86_64.sha256sum] = "8c5acd5ae567c0100245b0556941c237369f210bceb196edfe5a2e7532c60326" + +S = "${WORKDIR}/gcc-arm-${PV}-${HOST_ARCH}-${BINNAME}" + +UPSTREAM_CHECK_URI = "https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/downloads" +UPSTREAM_CHECK_REGEX = "gcc-arm-(?P<pver>.+)-${HOST_ARCH}-${BINNAME}\.tar\.\w+" --2.30.2