From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhOZW-0007Gx-0S for qemu-devel@nongnu.org; Tue, 06 Sep 2016 18:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhOZP-0000DD-R7 for qemu-devel@nongnu.org; Tue, 06 Sep 2016 18:10:24 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:49554 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhOZP-0000D7-MJ for qemu-devel@nongnu.org; Tue, 06 Sep 2016 18:10:19 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.17/8.16.0.17) with SMTP id u86K3DAo066775 for ; Tue, 6 Sep 2016 16:06:05 -0400 Received: from e06smtp09.uk.ibm.com (e06smtp09.uk.ibm.com [195.75.94.105]) by mx0b-001b2d01.pphosted.com with ESMTP id 25a2cuejqv-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 06 Sep 2016 16:06:05 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 6 Sep 2016 21:06:02 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id C5C7517D805A for ; Tue, 6 Sep 2016 21:07:49 +0100 (BST) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u86K5v3c8388872 for ; Tue, 6 Sep 2016 20:05:57 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u86K5vr0017417 for ; Tue, 6 Sep 2016 16:05:57 -0400 From: Sascha Silbe Date: Tue, 6 Sep 2016 22:05:49 +0200 In-Reply-To: <1473192351-601-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1473192351-601-1-git-send-email-silbe@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Message-Id: <1473192351-601-7-git-send-email-silbe@linux.vnet.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 6/8] 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 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 --- v2=E2=86=92v3: - fix unbalanced white space around pipes - replaced GNU-specific version sort option with POSIX compliant set of options tests/docker/dockerfiles/debian-bootstrap.pre | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker= /dockerfiles/debian-bootstrap.pre index 3d9f7f4..ee69e89 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=3D`which fakeroot 2> /dev/null` +# debootstrap < 1.0.67 generates empty sources.list, see Debian#732255 +MIN_DEBOOTSTRAP_VERSION=3D1.0.67 =20 exit_and_skip() { @@ -40,9 +42,17 @@ fi # =20 if [ -z $DEBOOTSTRAP_DIR ]; then + NEED_DEBOOTSTRAP=3Dfalse DEBOOTSTRAP=3D`which debootstrap 2> /dev/null` if [ -z $DEBOOTSTRAP ]; then echo "No debootstrap installed, attempting to install from SCM" + NEED_DEBOOTSTRAP=3Dtrue + elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --versi= on \ + | cut -d ' ' -f 2) | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C; t= hen + echo "debootstrap too old, attempting to install from SCM" + NEED_DEBOOTSTRAP=3Dtrue + fi + if $NEED_DEBOOTSTRAP; then DEBOOTSTRAP_SOURCE=3Dhttps://anonscm.debian.org/git/d-i/debootst= rap.git git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git export DEBOOTSTRAP_DIR=3D./debootstrap.git --=20 1.9.1