Skip to contentSkip to conversation

CI: add defaults for get-binary-toolchains

PATCH Applied Jon Mason 2 participants 3 messages Jul 24, 2023 – Jul 25, 2023

lore
Share & tools
lore

Jon Mason

author
#0 lore raw

PATCH 1/2 CI: add defaults for get-binary-toolchains

Pre-populate the standard values of get-binary-toolchains so that it will work without variables in a standard kas container. This will aid in ease-of-use for development and testing of binary toolchains.

---
 ci/get-binary-toolchains | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
ci/get-binary-toolchains +4 -3
index 23c3bbb1..69a4d38e 100755
@@ -5,9 +5,10 @@ BASENAME=arm-gnu-toolchain
 VER=${VER:-12.2.rel1}
 HOST_ARCH=${HOST_ARCH:-$(uname -m)}
 
-DOWNLOAD_DIR=$1
-TOOLCHAIN_DIR=$2
-TOOLCHAIN_LINK_DIR=$3
+# Use the standard kas container locations if nothing is passed into the script
+DOWNLOAD_DIR="${1:-/builds/persist/downloads/}"
+TOOLCHAIN_DIR="${2:-/builds/persist//toolchains/}"
+TOOLCHAIN_LINK_DIR="${3:-build/toolchains/}"
 
 # These should be already created by .gitlab-ci.yml, but do here if run outside of that env
 mkdir -p $DOWNLOAD_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
Signature · 1 line
2.30.2
author
#1 lore raw

PATCH 2/2 CI: workaround 32bit timer warning in binary toolchain

Temporary workaround for a number binaries in the toolchains that are using 32bit timer API. This must be done in the CI yml file instead of the recipe because of all the libraries in the toolchain have the issue.

---
 ci/external-gccarm.yml | 3 +++
 1 file changed, 3 insertions(+)
ci/external-gccarm.yml +3 -0
index fe8fa6ca..a3313d89 100644
@@ -6,3 +6,6 @@ local_conf_header:
     SKIP_RECIPE[gcc-cross-arm] = "Using external toolchain"
     TCMODE = "external-arm"
     EXTERNAL_TOOLCHAIN = "${TOPDIR}/toolchains/${TARGET_ARCH}"
+    # Temporary workaround for a number binaries in the toolchains that are using 32bit timer API
+    # This must be done here instead of the recipe because of all the libraries in the toolchain have the issue
+    INSANE_SKIP:append = " 32bit-time"
Signature · 1 line
2.30.2
Applied
#2 lore raw
In reply to Jon Mason
Quoted 5 lines · Jon Mason

Pre-populate the standard values of get-binary-toolchains so that it will work without variables in a standard kas container. This will aid in ease-of-use for development and testing of binary toolchains.

Applied, thanks!

[1/2] CI: add defaults for get-binary-toolchains

      commit: 887e47b7c59ebe6a45d8a4d959f6966e69789a87
[2/2] CI: workaround 32bit timer warning in binary toolchain
      commit: cfcc8a4d13c26793ecab2d8da9274eb98b8cb4ce

Best regards,

Signature · 1 line
Jon Mason <[email protected]>