From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhSLZ-0001wH-Vs for qemu-devel@nongnu.org; Tue, 06 Sep 2016 22:12:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bhSLV-0000dI-QG for qemu-devel@nongnu.org; Tue, 06 Sep 2016 22:12:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40820) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bhSLV-0000d7-KG for qemu-devel@nongnu.org; Tue, 06 Sep 2016 22:12:13 -0400 Date: Wed, 7 Sep 2016 10:12:10 +0800 From: Fam Zheng Message-ID: <20160907021210.GC30281@lemon> References: <1473192351-601-1-git-send-email-silbe@linux.vnet.ibm.com> <1473192351-601-7-git-send-email-silbe@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1473192351-601-7-git-send-email-silbe@linux.vnet.ibm.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [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: Sascha Silbe Cc: qemu-devel@nongnu.org On Tue, 09/06 22:05, Sascha Silbe wrote: > 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. >=20 > [1] https://bugs.debian.org/732255 >=20 > 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 >=20 > tests/docker/dockerfiles/debian-bootstrap.pre | 10 ++++++++++ > 1 file changed, 10 insertions(+) >=20 > diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/dock= er/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}" --ver= sion \ > + | cut -d ' ' -f 2) | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C;= then Like -V, -C is not available on OSX either. Maybe use "-c"? If so, I can = fix it when applying. https://developer.apple.com/legacy/library/documentation/Darwin/Reference= /ManPages/man1/sort.1.html Fam > + 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/deboot= strap.git > git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git > export DEBOOTSTRAP_DIR=3D./debootstrap.git > --=20 > 1.9.1 >=20 >=20