diff --git a/docker/Dockerfile b/docker/Dockerfile index 1160bc45af6adc4ddd44720083d6d45008793723..71ceef6ab4f9b8afab00ea9f98347dba38fa4ea8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -17,11 +17,11 @@ ARG TARGETOS ARG TARGETPLATFORM # Component versions -ARG FVP_UBUNTU_VERSION=24.04.1 -ARG BAZEL_BUILD_TOOLS_VER=v7.1.2 -ARG BAZELISK_VERSION=v1.20.0 +ARG FVP_UBUNTU_VERSION=24.04.2 +ARG BAZEL_BUILD_TOOLS_VER=v8.2.0 +ARG BAZELISK_VERSION=v1.26.0 ARG NDK_VERSION=r27c -ARG FVP_VERSION=11.27_19 +ARG FVP_VERSION=11.29_27 ENV XDG_CACHE_HOME=/cache ANDROID_NDK=/opt/devtools/android-ndk BUILD_CACHE=/build_cache @@ -101,8 +101,7 @@ WORKDIR / RUN wget "https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${TARGETOS}-${TARGETARCH}" -O /usr/bin/bazelisk && \ chmod a+x /usr/bin/bazelisk && \ USE_BAZEL_VERSION=7.x bazelisk && \ - chmod -R a+rw ${XDG_CACHE_HOME} && ln -s ${XDG_CACHE_HOME} /.cache && \ - USE_BAZEL_VERSION=6.5.0 bazelisk + chmod -R a+rw ${XDG_CACHE_HOME} && ln -s ${XDG_CACHE_HOME} /.cache RUN wget "https://github.com/bazelbuild/buildtools/releases/download/${BAZEL_BUILD_TOOLS_VER}/buildifier-${TARGETOS}-${TARGETARCH}" -O /usr/bin/buildifier && \ wget "https://github.com/bazelbuild/buildtools/releases/download/${BAZEL_BUILD_TOOLS_VER}/buildozer-${TARGETOS}-${TARGETARCH}" -O /usr/bin/buildozer && \ diff --git a/docker/build_linux_bootloader.sh b/docker/build_linux_bootloader.sh index d3196383f8bafa94da4a8f8f24a2f9f10e84461c..c843bd6954d548b5319550e59d0b480bca87142f 100755 --- a/docker/build_linux_bootloader.sh +++ b/docker/build_linux_bootloader.sh @@ -1,7 +1,7 @@ #!/bin/bash -eux # -# SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates +# SPDX-FileCopyrightText: Copyright 2024-2025 Arm Limited and/or its affiliates # # SPDX-License-Identifier: Apache-2.0 # @@ -29,11 +29,11 @@ else echo "Unknown $TARGETARCH" && exit 1 fi -TOOLCHAIN_VER=13.3.rel1 +TOOLCHAIN_VER=14.2.rel1 TOOLCHAIN_TYPE=aarch64-none-elf TOOLCHAIN_DIR=$(pwd)/toolchain-${TOOLCHAIN_TYPE}/ CROSS_COMPILE=${TOOLCHAIN_DIR}/bin/${TOOLCHAIN_TYPE}- -KERNEL_VERSION=6.9.12 +KERNEL_VERSION=6.12.30 mkdir -p ${BUILD_CACHE}