Skip to content

Commit c4320c1

Browse files
committed
Fix CI for x86_64-uefi
Using Fedora image now. Also had to modify remote-test-server since EFI_TCP4_SERVICE_BINDING_PROTOCOL might not be present yet. Signed-off-by: Ayush <ayushsingh1325@gmail.com>
1 parent 3702334 commit c4320c1

File tree

14 files changed

+15
-87
lines changed

14 files changed

+15
-87
lines changed

src/ci/docker/OVMF/OVMF_CODE.fd

-1.88 MB
Binary file not shown.

src/ci/docker/OVMF/OVMF_VARS.fd

-128 KB
Binary file not shown.

src/ci/docker/OVMF/UefiShell.iso

-2.47 MB
Binary file not shown.

src/ci/docker/host-x86_64/i686-uefi/Dockerfile

Lines changed: 0 additions & 48 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
Binary file not shown.

src/ci/docker/host-x86_64/x86_64-uefi/Dockerfile

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ubuntu:22.04
1+
FROM fedora:latest
22

3-
RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
3+
RUN dnf update -y && dnf install -y \
44
bc \
55
bzip2 \
66
ca-certificates \
@@ -10,13 +10,14 @@ RUN apt-get update -y && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-
1010
file \
1111
g++ \
1212
git \
13-
libc6-dev \
1413
make \
1514
ninja-build \
1615
python3 \
17-
qemu-system \
16+
qemu \
17+
edk2-ovmf \
1818
mtools \
19-
xz-utils
19+
xz \
20+
libstdc++-static
2021

2122
ENV ARCH=x86_64
2223

@@ -27,11 +28,9 @@ RUN mkdir rootfs
2728
# Copy over startup script
2829
COPY scripts/qemu_uefi.nsh rootfs/startup.nsh
2930

30-
# OVMF Stuff
31+
# This is here in case we want to use some other version/source for OVMF
3132
RUN mkdir OVMF
32-
COPY OVMF/OVMF_CODE.fd OVMF/OVMF_CODE.fd
33-
COPY OVMF/OVMF_VARS.fd OVMF/OVMF_VARS.fd
34-
COPY OVMF/UefiShell.iso OVMF/UefiShell.iso
33+
RUN cp /usr/share/OVMF/* OVMF
3534

3635
# TODO: What is this?!
3736
# Source of the file: https://github.com/vfdev-5/qemu-rpi2-vexpress/raw/master/vexpress-v2p-ca15-tc1.dtb
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)