From 1d924938b9dd6d554b00627b60b1aef5ea975ebd Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 14:00:40 +0000
Subject: [PATCH 1/3] fix(ci): set FORCE_UNSAFE_CONFIGURE for riscv buildroot
 image

---
 tests/rsrc/riscv-64/Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/rsrc/riscv-64/Dockerfile b/tests/rsrc/riscv-64/Dockerfile
index 71028b41..23233a53 100644
--- a/tests/rsrc/riscv-64/Dockerfile
+++ b/tests/rsrc/riscv-64/Dockerfile
@@ -38,6 +38,7 @@ COPY tsffs.h /test/usr/tsffs.h
 
 # Build Linux, Linux Kernel Modules & RootFS
 # Build size: 7.9G
+ENV FORCE_UNSAFE_CONFIGURE=1
 RUN make BR2_EXTERNAL=/test/test-kernel-modules/ simics_simple_riscv_defconfig && \
     make && \
     echo "Compressing images" && \

From 5121f8d18668290e379444123864b8c7ebafe3d9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 15:16:52 +0000
Subject: [PATCH 2/3] build(deps): bump ubuntu from 22.04 to 26.04 and set
 FORCE_UNSAFE_CONFIGURE

---
 tests/rsrc/riscv-64/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/rsrc/riscv-64/Dockerfile b/tests/rsrc/riscv-64/Dockerfile
index 23233a53..15d53023 100644
--- a/tests/rsrc/riscv-64/Dockerfile
+++ b/tests/rsrc/riscv-64/Dockerfile
@@ -1,5 +1,5 @@
 # hadolint global ignore=DL3008
-FROM ubuntu:22.04@sha256:445586e41c1de7dfda82d2637f5ff688deea9eb5f5812f8c145afacc35b9f0db AS buildroot
+FROM ubuntu:26.04@sha256:f3d28607ddd78734bb7f71f117f3c6706c666b8b76cbff7c9ff6e5718d46ff64 AS buildroot
 
 ARG BUILDROOT_REV="2023.11.x"
 

From d1402718253630fc9ad243c328f0e205af4cf747 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 12 Jun 2026 23:29:29 +0000
Subject: [PATCH 3/3] fix(ci): use gcc-13 host compiler for riscv buildroot on
 ubuntu 26.04

---
 tests/rsrc/riscv-64/Dockerfile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/rsrc/riscv-64/Dockerfile b/tests/rsrc/riscv-64/Dockerfile
index 15d53023..1d0d929a 100644
--- a/tests/rsrc/riscv-64/Dockerfile
+++ b/tests/rsrc/riscv-64/Dockerfile
@@ -17,6 +17,8 @@ RUN apt-get -y update && \
     git \
     gcc \
     g++ \
+    gcc-13 \
+    g++-13 \
     rsync \
     unzip \
     wget
@@ -39,6 +41,8 @@ COPY tsffs.h /test/usr/tsffs.h
 # Build Linux, Linux Kernel Modules & RootFS
 # Build size: 7.9G
 ENV FORCE_UNSAFE_CONFIGURE=1
+ENV HOSTCC=/usr/bin/gcc-13
+ENV HOSTCXX=/usr/bin/g++-13
 RUN make BR2_EXTERNAL=/test/test-kernel-modules/ simics_simple_riscv_defconfig && \
     make && \
     echo "Compressing images" && \