From cd56080d6bce328a5e98322ecab876ee716098b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ga=C5=82da?= Date: Mon, 8 Apr 2024 10:26:58 +0200 Subject: [PATCH] tools: Use yaml files to calculate toolchain id MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If yaml files are present, toolchain bundler uses them instead of txt files as source of required tools. Signed-off-by: Jan Gałda --- scripts/print_toolchain_checksum.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/print_toolchain_checksum.sh b/scripts/print_toolchain_checksum.sh index 2928297ba028..e8a3bf194171 100755 --- a/scripts/print_toolchain_checksum.sh +++ b/scripts/print_toolchain_checksum.sh @@ -2,7 +2,7 @@ BASEDIR=$(dirname "$0") REQUIREMENTS=$BASEDIR/requirements-fixed.txt -TOOLS_VERSIONS=$BASEDIR/tools-versions-linux.txt -TOOLCHAIN_VERSION=$(cat $REQUIREMENTS $TOOLS_VERSIONS | sha256sum | head -c 10) +TOOLS_VERSIONS=$BASEDIR/tools-versions-linux.yml +TOOLCHAIN_VERSION=$(cat $REQUIREMENTS $TOOLS_VERSIONS | tr -d '\r' | sha256sum | head -c 10) echo "${TOOLCHAIN_VERSION}"