docker: switch from kernel crosstools compilers to Debian cross-compi…

…lers Now it is possible to build fully functional OpenBIOS binaries for all architectures using the Debian cross-compiler packages, so switch the builder image from the kernel crosstools compilers to the packaged Debian cross-compilers. Sigend-off-by: Mark Cave-Ayland <[email protected]>
mcayland · Apr 17, 2024 · bf5fe5d · bf5fe5d
1 parent d3a643a
commit bf5fe5d
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/docker/Dockerfile.builder b/docker/Dockerfile.builder
@@ -1,19 +1,6 @@
-FROM ghcr.io/mcayland/fcode-utils:master AS cross
+FROM ghcr.io/mcayland/fcode-utils:master AS builder
 
 RUN apt-get update && \
-    apt-get install -y wget xz-utils tar && \
-    wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/10.1.0/x86_64-gcc-10.1.0-nolibc-sparc64-linux.tar.xz && \
-    tar Jxf x86_64-gcc-10.1.0-nolibc-sparc64-linux.tar.xz && \
-    rm -f x86_64-gcc-10.1.0-nolibc-sparc64-linux.tar.xz && \
-    wget https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/10.1.0/x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz && \
-    tar Jxf x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz && \
-    rm -f x86_64-gcc-10.1.0-nolibc-powerpc-linux.tar.xz
+    apt-get install -y \
+        make xsltproc zip libc6-dev-i386 gcc gcc-multilib-powerpc-linux-gnu gcc-multilib-sparc64-linux-gnu
 
-FROM ghcr.io/openbios/fcode-utils:master AS builder
-
-COPY --from=cross /gcc-10.1.0-nolibc /gcc-10.1.0-nolibc
-
-RUN apt-get update && \
-    apt-get install -y make xsltproc gcc gcc-multilib zip
-
-ENV PATH /gcc-10.1.0-nolibc/sparc64-linux/bin:/gcc-10.1.0-nolibc/powerpc-linux/bin:$PATH