From: Stefano Stabellini <sstabellini@kernel.org>
Date: Wed, 13 Dec 2017 00:20:31 +0000 (-0800)
Subject: The Linux build doesn't depend on the Xen and QEMU build. Make it independent.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6d5c3e6e91dfc3f5a5ca61bce00bab7a1078ae79;p=people%2Fsstabellini%2Fmojo.git%2F.git

The Linux build doesn't depend on the Xen and QEMU build. Make it independent.

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/alpine-dom0/dom0/Dockerfile b/alpine-dom0/dom0/Dockerfile
index c923afd..e60e57c 100644
--- a/alpine-dom0/dom0/Dockerfile
+++ b/alpine-dom0/dom0/Dockerfile
@@ -5,6 +5,7 @@ RUN \
 	apk add openrc
 
 ADD udhcpc.script /usr/share/udhcpc/default.script
+COPY --from=mojoos/qemu-builder:qemu-builder /out/ /
 COPY --from=mojoos/linux-builder:linux-builder /out/ /
 
 RUN \
diff --git a/alpine-dom0/linux-builder/Dockerfile b/alpine-dom0/linux-builder/Dockerfile
index d8b29a3..0e3e4c9 100644
--- a/alpine-dom0/linux-builder/Dockerfile
+++ b/alpine-dom0/linux-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM mojoos/qemu-builder:qemu-builder as linux-builder
+FROM alpine:3.6 as linux-builder
 
 COPY linux-config /root/
 
@@ -9,8 +9,8 @@ ENV LINUX_VERSION=4.14
 RUN \
     apk update && \
 # Linux build deps
-    apk add bc
-
+    apk add bc curl gcc make binutils-dev build-base libressl-dev \
+    ncurses-dev tar xz xz-dev zlib-dev libelf-dev linux-headers perl
 # Download and build Linux
 RUN \
 cd $SOURCE_DIR && \
@@ -19,6 +19,7 @@ tar xvJf linux-$LINUX_VERSION.tar.xz && \
 cd linux-$LINUX_VERSION && \
 cp $SOURCE_DIR/linux-config .config && \
 make -j "$(getconf _NPROCESSORS_ONLN)" && \
+mkdir -p $OUT_DIR/boot && \
 cp arch/x86/boot/bzImage $OUT_DIR/boot/kernel
 
 ENTRYPOINT ["/bin/sh"]