[PATCH master] ci: container: fix CROSS_COMPILE_openrisc to point at correct version

[PATCH master] ci: container: fix CROSS_COMPILE_openrisc to point at correct version

[Ahmad Fatoum]

Due to the test failing with the latest 14.2.0 release, we are
downgrading OpenRISC to the old GCC 13.1.0 version as an interim
measure. The patch doing this was faulty and while it downloaded
the older toolchain, the CROSS_COMPILE_openrisc variable still
referenced the 14.2.0 toolchain breaking MAKEALL.

Fixes: 6d4c6b01f4c4 ("ci: container: downgrade OpenRISC toolchain from 14.2.0 to 13.1.0")
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
This is hopefully the last patch needed to make CI green again.
---
 test/Containerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/Containerfile b/test/Containerfile
index 97182ccb29ed..1c4932f56a64 100644
--- a/test/Containerfile
+++ b/test/Containerfile
@@ -83,7 +83,7 @@ RUN cd /tmp && \
 ENV CROSS_COMPILE_arm=/opt/gcc-${GCC_VERSION}-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-
 ENV CROSS_COMPILE_arm64=/opt/gcc-${GCC_VERSION}-nolibc/aarch64-linux/bin/aarch64-linux-
 ENV CROSS_COMPILE_mips=/opt/gcc-${GCC_VERSION}-nolibc/mips-linux/bin/mips-linux-
-ENV CROSS_COMPILE_openrisc=/opt/gcc-${GCC_VERSION}-nolibc/or1k-linux/bin/or1k-linux-
+ENV CROSS_COMPILE_openrisc=/opt/gcc-13.1.0-nolibc/or1k-linux/bin/or1k-linux-
 ENV CROSS_COMPILE_powerpc=/opt/gcc-${GCC_VERSION}-nolibc/powerpc-linux/bin/powerpc-linux-
 ENV CROSS_COMPILE_riscv=/opt/gcc-${GCC_VERSION}-nolibc/riscv64-linux/bin/riscv64-linux-
 ENV CROSS_COMPILE_kvx=/opt/gcc-kalray-kvx-v5.0.0/bin/kvx-elf-
-- 
2.39.2

Re: [PATCH master] ci: container: fix CROSS_COMPILE_openrisc to point at correct version

[Sascha Hauer]

On Thu, 22 Aug 2024 13:53:36 +0200, Ahmad Fatoum wrote:
> Due to the test failing with the latest 14.2.0 release, we are
> downgrading OpenRISC to the old GCC 13.1.0 version as an interim
> measure. The patch doing this was faulty and while it downloaded
> the older toolchain, the CROSS_COMPILE_openrisc variable still
> referenced the 14.2.0 toolchain breaking MAKEALL.
> 
> 
> [...]

Applied, thanks!

[1/1] ci: container: fix CROSS_COMPILE_openrisc to point at correct version
      https://git.pengutronix.de/cgit/barebox/commit/?id=18a154ce190e (link may not be stable)

Best regards,
-- 
Sascha Hauer <s.hauer@pengutronix.de>