summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorSascha Silbe <silbe@linux.vnet.ibm.com>2016-09-06 22:05:50 +0200
committerFam Zheng <famz@redhat.com>2016-09-08 19:56:34 +0800
commitae2f659ca5eb8e39a83b11dc55e7e474b536e4e6 (patch)
tree6910acd64f4500ca7af7e11be16fbb5fd8294623
parent00263139f888bfb1cb144790799c62cb60fe4cb6 (diff)
downloadfocaccia-qemu-ae2f659ca5eb8e39a83b11dc55e7e474b536e4e6.tar.gz
focaccia-qemu-ae2f659ca5eb8e39a83b11dc55e7e474b536e4e6.zip
docker: build debootstrap after cloning
When using the git version of debootstrap (because no usable version
of debootstrap was installed on the host), we need to run 'make' so
that devices.tar.gz gets built. Otherwise the first debootstrap stage
will fail without printing any error message.

Signed-off-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Message-Id: <1473192351-601-8-git-send-email-silbe@linux.vnet.ibm.com>
Signed-off-by: Fam Zheng <famz@redhat.com>
-rwxr-xr-xtests/docker/dockerfiles/debian-bootstrap.pre1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre
index 1d4f7774c5..7c76dce663 100755
--- a/tests/docker/dockerfiles/debian-bootstrap.pre
+++ b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -57,6 +57,7 @@ if [ -z $DEBOOTSTRAP_DIR ]; then
         git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git
         export DEBOOTSTRAP_DIR=./debootstrap.git
         DEBOOTSTRAP=./debootstrap.git/debootstrap
+        (cd "${DEBOOTSTRAP_DIR}" && "${FAKEROOT}" make )
     fi
 else
     DEBOOTSTRAP=${DEBOOTSTRAP_DIR}/debootstrap