Fix usage of busybox.static in Alpine Linux

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

diff --git a/alpine-dom0/rkt-builder/Dockerfile b/alpine-dom0/rkt-builder/Dockerfile
index 6388e97a57c447405344184e2c27232909bef208..0d48da41a7020de0f85b7a2b061a1863f9f2436a 100644 (file)
--- a/alpine-dom0/rkt-builder/Dockerfile
+++ b/alpine-dom0/rkt-builder/Dockerfile
@@ -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
 # 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 wget tar xz binutils-dev build-base libressl-dev ncurses-dev xz-dev zlib-dev libelf-dev perl
+    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 busybox-static

 
 RUN \
 cd $SOURCE_DIR && \
 
 RUN \
 cd $SOURCE_DIR && \


@@ -25,6 +25,9 @@ make -j "$(getconf _NPROCESSORS_ONLN)" && \
 mkdir -p $OUT_DIR/usr/bin && \
 cp ./build-rkt-1.26.0/target/bin/rkt $OUT_DIR/usr/bin && \
 cd .. && \
 mkdir -p $OUT_DIR/usr/bin && \
 cp ./build-rkt-1.26.0/target/bin/rkt $OUT_DIR/usr/bin && \
 cd .. && \

+# workaround for Alpine Linux busybox-static naming
+mv /bin/busybox /bin/busybox.dyn && \
+mv /bin/busybox.static /bin/busybox && \

 git clone http://github.com/rkt/stage1-xen.git && \ 
 cd stage1-xen && \
 bash build.sh && \
 git clone http://github.com/rkt/stage1-xen.git && \ 
 cd stage1-xen && \
 bash build.sh && \