From: Stefano Stabellini <sstabellini@kernel.org>
Date: Thu, 12 Apr 2018 23:24:46 +0000 (-0700)
Subject: Fix rkt and stage1-xen build
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=d257adb204752ec6482f1c7c6003929afc7e0043;p=people%2Fsstabellini%2Fmojo.git%2F.git

Fix rkt and stage1-xen build

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

diff --git a/alpine-dom0/rkt-builder/Dockerfile b/alpine-dom0/rkt-builder/Dockerfile
index 7feb4b3..6388e97 100644
--- a/alpine-dom0/rkt-builder/Dockerfile
+++ b/alpine-dom0/rkt-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM FROM alpine:3.6 as rkt-builder
+FROM alpine:3.6 as rkt-builder
 
 ENV SOURCE_DIR=/root
 ENV OUT_DIR=/out
@@ -9,7 +9,7 @@ RUN \
 # rkt dependencies
     apk add git autoconf automake gcc patch musl-dev bash squashfs-tools acl-dev libacl grep gnupg file go make diffutils coreutils cpio gzip && \
 # stage1-xen dependencies
-    apk add bc jq linux-headers glide
+    apk add bc jq linux-headers glide wget tar xz binutils-dev build-base libressl-dev ncurses-dev xz-dev zlib-dev libelf-dev perl
 
 RUN \
 cd $SOURCE_DIR && \
@@ -20,10 +20,10 @@ git clone https://github.com/coreos/rkt.git && \
 cd rkt && \
 git checkout -b my-$RKT_VERSION $RKT_VERSION && \
 ./autogen.sh && \
-./configure --with-stage1-flavors=coreos,fly --disable-tpm --disable-sdjournal && \
+./configure --with-stage1-flavors=fly --disable-tpm --disable-sdjournal && \
 make -j "$(getconf _NPROCESSORS_ONLN)" && \
 mkdir -p $OUT_DIR/usr/bin && \
-cp ./build-rkt-1.29.0+git/target/bin/rkt $OUT_DIR/usr/bin && \
+cp ./build-rkt-1.26.0/target/bin/rkt $OUT_DIR/usr/bin && \
 cd .. && \
 git clone http://github.com/rkt/stage1-xen.git && \ 
 cd stage1-xen && \