Fix alpine-build-script

Download release tarball instead of git clone.
Apply patches as necessary.
Build QEMU against the Xen install dir (as oppused to the Xen build
dir).

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

diff --git a/build.sh b/build.sh
index abe6ba4d4a67e4bc68889f829b9857754eee7ec4..1000280232bcb4fba8858b021259d0101b60f36d 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -20,7 +20,7 @@ fi
 if ! test -d out
 then
     mkdir out
-    docker run -v $SOURCE_DIR/xen:/root/xen -v $SOURCE_DIR/qemu:/root/qemu -v $OUT_DIR:/root/out -t $BUILDER_LABEL /root/alpine-build-script
+    docker run -v $OUT_DIR:/root/out -t $BUILDER_LABEL /root/alpine-build-script
 fi
 
 

diff --git a/dockerfiles/alpine-build-script b/dockerfiles/alpine-build-script
index 6f30d24143020e505fcb41bff6aab1a1085a4920..cf21de0979fb0c04aa66ff284eb34f8d7d58509d 100644 (file)
--- a/dockerfiles/alpine-build-script
+++ b/dockerfiles/alpine-build-script
@@ -2,49 +2,30 @@
 
 SOURCE_DIR=/root
 OUT_DIR=/root/out
+XEN_VERSION=4.10.0-rc3
+QEMU_VERSION=2.10.1
 
 cd $SOURCE_DIR
-#git clone git://xenbits.xen.org/xen.git
-cd xen
-#patch -p1 < $SOURCE_DIR/xen-patch
+curl -fsSLO https://downloads.xenproject.org/release/xen/$XEN_VERSION/xen-$XEN_VERSION.tar.gz
+tar xvzf xen-$XEN_VERSION.tar.gz
+cd xen-$XEN_VERSION
+patch -p1 < $SOURCE_DIR/xen-patch
 ./configure --prefix=/usr --with-system-qemu=/usr/lib/xen/bin/qemu-system-i386 --disable-stubdom --disable-qemu-traditional --disable-rombios
 make -j4
 mkdir -p DESTDIR=$OUT_DIR/xen
 make DESTDIR=$OUT_DIR/xen install
 
 cd $SOURCE_DIR
-#git clone git://git.qemu.org/qemu.git
-cd qemu
-#patch -p1 < $SOURCE_DIR/qemu-patch
-export DIR=$SOURCE_DIR/xen
-export PKG_CONFIG_PATH=$DIR/tools/pkg-config
+curl -fsSLO https://download.qemu.org/qemu-$QEMU_VERSION.tar.xz
+tar xvJf qemu-$QEMU_VERSION.tar.xz
+cd qemu-$QEMU_VERSION
+patch -p1 < $SOURCE_DIR/qemu-patch
+export PKG_CONFIG_PATH=$SOURCE_DIR/xen/tools/pkg-config
+export INST_DIR=$OUT_DIR/xen
 ./configure --prefix=/usr --enable-xen --target-list=i386-softmmu \
-               --extra-cflags="-I$DIR/tools/include \
-               -I$DIR/tools/libs/toollog/include \
-               -I$DIR/tools/libs/evtchn/include \
-               -I$DIR/tools/libs/gnttab/include \
-               -I$DIR/tools/libs/foreignmemory/include \
-               -I$DIR/tools/libs/devicemodel/include \
-               -I$DIR/tools/libs/toolcore/include \
-               -I$DIR/tools/libxc/include \
-               -I$DIR/tools/xenstore/include \
-               -I$DIR/tools/xenstore/compat/include" \
-               --extra-ldflags="-L$DIR/tools/libxc \
-               -L$DIR/tools/xenstore \
-               -L$DIR/tools/libs/evtchn \
-               -L$DIR/tools/libs/gnttab \
-               -L$DIR/tools/libs/foreignmemory \
-               -L$DIR/tools/libs/call \
-               -L$DIR/tools/libs/toolcore \
-               -L$DIR/tools/libs/devicemodel \
-               -Wl,-rpath-link=$DIR/tools/libs/toollog \
-               -Wl,-rpath-link=$DIR/tools/libs/evtchn \
-               -Wl,-rpath-link=$DIR/tools/libs/gnttab \
-               -Wl,-rpath-link=$DIR/tools/libs/call \
-               -Wl,-rpath-link=$DIR/tools/libs/foreignmemory \
-               -Wl,-rpath-link=$DIR/tools/libs/call \
-               -Wl,-rpath-link=$DIR/tools/libs/toolcore \
-               -Wl,-rpath-link=$DIR/tools/libs/devicemodel" \
+               --extra-cflags="-I$INST_DIR/usr/include" \
+        --extra-ldflags="-L$INST_DIR/usr/lib -Wl,-rpath-link=$INST_DIR/usr/lib \
+                         -L$INST_DIR/usr/lib64 -Wl,-rpath-link=$INST_DIR/usr/lib64" \
         --disable-kvm --enable-virtfs --disable-werror
 make -j 4
 mkdir -p DESTDIR=$OUT_DIR/qemu