]> git.proxmox.com Git - mirror_qemu.git/commitdiff
docker: build debootstrap after cloning
authorSascha Silbe <silbe@linux.vnet.ibm.com>
Tue, 6 Sep 2016 20:05:50 +0000 (22:05 +0200)
committerFam Zheng <famz@redhat.com>
Thu, 8 Sep 2016 11:56:34 +0000 (19:56 +0800)
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>
tests/docker/dockerfiles/debian-bootstrap.pre

index 1d4f7774c58cacf6f65538d95242775e3978d0f5..7c76dce663e1d8ad2c2937c8bfa0e85e16e0f986 100755 (executable)
@@ -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