From: Stefano Stabellini Date: Fri, 13 Apr 2018 00:42:16 +0000 (-0700) Subject: Fix usage of busybox.static in Alpine Linux X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=people%2Fsstabellini%2Fmojo.git%2F.git Fix usage of busybox.static in Alpine Linux Signed-off-by: Stefano Stabellini --- diff --git a/alpine-dom0/rkt-builder/Dockerfile b/alpine-dom0/rkt-builder/Dockerfile index 6388e97..0d48da4 100644 --- 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 - 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 && \ @@ -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 .. && \ +# 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 && \