From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60161) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bccxZ-0007qN-LX for qemu-devel@nongnu.org; Wed, 24 Aug 2016 14:31:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bccxR-0002a5-AW for qemu-devel@nongnu.org; Wed, 24 Aug 2016 14:31:33 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:55693 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bccxR-0002Zi-4q for qemu-devel@nongnu.org; Wed, 24 Aug 2016 14:31:25 -0400 Received: from pps.filterd (m0098416.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7OISsE5040592 for ; Wed, 24 Aug 2016 14:31:24 -0400 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0b-001b2d01.pphosted.com with ESMTP id 251b8qkh9u-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 24 Aug 2016 14:31:24 -0400 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 24 Aug 2016 19:31:23 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 6A00F17D8056 for ; Wed, 24 Aug 2016 19:33:06 +0100 (BST) Received: from d06av03.portsmouth.uk.ibm.com (d06av03.portsmouth.uk.ibm.com [9.149.37.213]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u7OIVKGe524624 for ; Wed, 24 Aug 2016 18:31:20 GMT Received: from d06av03.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av03.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u7OIVJI5014097 for ; Wed, 24 Aug 2016 12:31:19 -0600 From: Sascha Silbe Date: Wed, 24 Aug 2016 20:31:01 +0200 In-Reply-To: <1472063464-790-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1472063464-790-1-git-send-email-silbe@linux.vnet.ibm.com> Message-Id: <1472063464-790-6-git-send-email-silbe@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.0.67 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Fam Zheng Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= debootstrap prior to 1.0.67 generated an empty sources.list during foreign bootstraps (Debian#732255 [1]). Fall back to the git checkout if the installed debootstrap version is too old. [1] https://bugs.debian.org/732255 Signed-off-by: Sascha Silbe --- Not sure if this used to work in even older debootstrap versions; I don't remember running into this before. But then I needed to set up several config files manually after a debootstrap anyway (both foreign and native), so sources.list might just have been another one to fix up manually. tests/docker/dockerfiles/debian-bootstrap.pre | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 2ae363f..3c3e781 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -3,6 +3,8 @@ # Simple wrapper for debootstrap, run in the docker build context # FAKEROOT=`which fakeroot 2> /dev/null` +# debootstrap < 1.0.67 generates empty sources.list, see Debian#732255 +MIN_DEBOOTSTRAP_VERSION=1.0.67 exit_and_skip() { @@ -40,9 +42,16 @@ fi # if [ -z $DEBOOTSTRAP_DIR ]; then + NEED_DEBOOTSTRAP=false DEBOOTSTRAP=`which debootstrap 2> /dev/null` if [ -z $DEBOOTSTRAP ]; then echo "No debootstrap installed, attempting to install from SCM" + NEED_DEBOOTSTRAP=true + elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --version |cut -d ' ' -f 2) |sort -VC; then + echo "debootstrap too old, attempting to install from SCM" + NEED_DEBOOTSTRAP=true + fi + if $NEED_DEBOOTSTRAP; then DEBOOTSTRAP_SOURCE=https://anonscm.debian.org/git/d-i/debootstrap.git git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git export DEBOOTSTRAP_DIR=./debootstrap.git -- 1.9.1