Skip to content

Commit 3384e2e

Browse files
committed
[toolchain] Ensure toolchains can build with libslirp support
The Linux userspace platform now has a meaningful all-drivers build target, which includes the af_packet, slirp, and tap drivers. Building this target requires libslirp to be available. Add the libslirp-devel package to the x86 toolchains (which do not use sysroots), and ensure that all toolchains are capable of building the all-drivers Linux userspace binary. Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
1 parent 35ab9a6 commit 3384e2e

1 file changed

Lines changed: 16 additions & 7 deletions

File tree

toolchain/Dockerfile

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ RUN dnf install -y \
3232
perl-File-Find \
3333
perl-FindBin \
3434
perl-lib \
35+
libslirp-devel \
3536
valgrind \
3637
&& dnf clean all -y
3738

@@ -47,7 +48,8 @@ WORKDIR /ipxe/src
4748
CMD make -j ${JOBS} \
4849
bin-x86_64-pcbios/intel.mrom bin-x86_64-pcbios/ipxe.iso \
4950
bin-x86_64-efi/snponly.efi bin-x86_64-efi/ipxe.iso \
50-
bin-x86_64-linux/tests.linux bin-x86_64-linux/errors && \
51+
bin-x86_64-linux/ipxe.linux bin-x86_64-linux/tests.linux \
52+
bin-x86_64-linux/errors && \
5153
valgrind ./bin-x86_64-linux/tests.linux && \
5254
./util/niclist.pl --output /dev/null
5355

@@ -63,6 +65,7 @@ RUN dnf install -y \
6365
perl-FindBin \
6466
perl-lib \
6567
glibc-devel.i686 \
68+
libslirp-devel.i686 \
6669
valgrind.i686 \
6770
&& dnf clean all -y
6871

@@ -78,7 +81,8 @@ WORKDIR /ipxe/src
7881
CMD make -j ${JOBS} \
7982
bin/intel.mrom bin/ipxe.iso \
8083
bin-i386-efi/snponly.efi bin-i386-efi/ipxe.iso \
81-
bin-i386-linux/tests.linux bin-i386-linux/errors && \
84+
bin-i386-linux/ipxe.linux bin-i386-linux/tests.linux \
85+
bin-i386-linux/errors && \
8286
valgrind ./bin-i386-linux/tests.linux && \
8387
./util/niclist.pl --output /dev/null
8488

@@ -110,7 +114,8 @@ WORKDIR /ipxe/src
110114

111115
CMD make -j ${JOBS} \
112116
bin-arm64-efi/snponly.efi bin-arm64-efi/ipxe.iso \
113-
bin-arm64-linux/tests.linux bin-arm64-linux/errors && \
117+
bin-arm64-linux/ipxe.linux bin-arm64-linux/tests.linux \
118+
bin-arm64-linux/errors && \
114119
qemu-aarch64-static ./bin-arm64-linux/tests.linux
115120

116121
#
@@ -141,7 +146,8 @@ WORKDIR /ipxe/src
141146

142147
CMD make -j ${JOBS} \
143148
bin-arm32-efi/snponly.efi bin-arm32-efi/ipxe.iso \
144-
bin-arm32-linux/tests.linux bin-arm32-linux/errors && \
149+
bin-arm32-linux/ipxe.linux bin-arm32-linux/tests.linux \
150+
bin-arm32-linux/errors && \
145151
qemu-arm-static ./bin-arm32-linux/tests.linux
146152

147153
#
@@ -172,7 +178,8 @@ WORKDIR /ipxe/src
172178

173179
CMD make -j ${JOBS} \
174180
bin-loong64-efi/snponly.efi bin-loong64-efi/ipxe.iso \
175-
bin-loong64-linux/tests.linux bin-loong64-linux/errors && \
181+
bin-loong64-linux/ipxe.linux bin-loong64-linux/tests.linux \
182+
bin-loong64-linux/errors && \
176183
qemu-loongarch64-static ./bin-loong64-linux/tests.linux
177184

178185
#
@@ -204,7 +211,8 @@ WORKDIR /ipxe/src
204211
CMD make -j ${JOBS} \
205212
bin-riscv64/ipxe.sbi \
206213
bin-riscv64-efi/snponly.efi bin-riscv64-efi/ipxe.iso \
207-
bin-riscv64-linux/tests.linux bin-riscv64-linux/errors && \
214+
bin-riscv64-linux/ipxe.linux bin-riscv64-linux/tests.linux \
215+
bin-riscv64-linux/errors && \
208216
qemu-riscv64-static ./bin-riscv64-linux/tests.linux
209217

210218
#
@@ -233,7 +241,8 @@ WORKDIR /ipxe/src
233241
CMD make -j ${JOBS} \
234242
bin-riscv32/ipxe.sbi \
235243
bin-riscv32-efi/snponly.efi bin-riscv32-efi/ipxe.iso \
236-
bin-riscv32-linux/tests.linux bin-riscv32-linux/errors && \
244+
bin-riscv32-linux/ipxe.linux bin-riscv32-linux/tests.linux \
245+
bin-riscv32-linux/errors && \
237246
qemu-riscv32-static ./bin-riscv32-linux/tests.linux
238247

239248
#

0 commit comments

Comments
 (0)