Skip to content

Commit e8529c7

Browse files
committed
Auto merge of #77759 - tblah:fix_riscv_qemu, r=pietroalbini
ci: Fix riscv64gc linux test QEMU fault, plus doc link fix Newer versions of the `qemu` package (used for riscv64gc-unknown-linux-gnu testing) don't work with the version of the RISC-V bootloader we were using. a4a0342 bumps to a revision which should fix the problem. e0b033e fixes a documentation failure I encountered while running the tests.
2 parents ec40181 + e0b033e commit e8529c7

File tree

1 file changed

+3
-3
lines changed
  • src/ci/docker/host-x86_64/disabled/riscv64gc-linux

1 file changed

+3
-3
lines changed

src/ci/docker/host-x86_64/disabled/riscv64gc-linux/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ RUN riscv64-linux-gnu-gcc addentropy.c -o rootfs/addentropy -static
8484
# download and build the riscv bootloader
8585
RUN git clone https://github.com/riscv/riscv-pk
8686
WORKDIR /tmp/riscv-pk
87-
# nothing special about this revision: it is just master at the time of writing
88-
# v1.0.0 doesn't build
89-
RUN git checkout 5d9ed238e1cabfbca3c47f50d32894ce94bfc304
87+
# This revision fixes a fault in recent QEMU from 64-bit accesses to the PLIC
88+
# commits later than this one should work too
89+
RUN git checkout 7d8b7c0dab72108e3ea7bb7744d3f6cc907c7ef4
9090
RUN mkdir build && cd build && \
9191
../configure --with-payload=/tmp/vmlinux --host=riscv64-linux-gnu && \
9292
make -j$(nproc) && \

0 commit comments

Comments
 (0)