From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baTgK-0002u8-HS for qemu-devel@nongnu.org; Thu, 18 Aug 2016 16:12:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1baTgA-0004n6-9s for qemu-devel@nongnu.org; Thu, 18 Aug 2016 16:12:52 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:63158 helo=mx0a-001b2d01.pphosted.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1baTgA-0004mq-3y for qemu-devel@nongnu.org; Thu, 18 Aug 2016 16:12:42 -0400 Received: from pps.filterd (m0098414.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7IK8xlE110941 for ; Thu, 18 Aug 2016 16:12:41 -0400 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0b-001b2d01.pphosted.com with ESMTP id 24wg7fgtjr-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 18 Aug 2016 16:12:41 -0400 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 18 Aug 2016 21:12:40 +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 6492E17D805A for ; Thu, 18 Aug 2016 21:14:20 +0100 (BST) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u7IKCamg11010426 for ; Thu, 18 Aug 2016 20:12:36 GMT Received: from d06av02.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u7IKCaZJ021646 for ; Thu, 18 Aug 2016 14:12:36 -0600 From: Sascha Silbe Date: Thu, 18 Aug 2016 22:12:32 +0200 In-Reply-To: <1471551152-26107-1-git-send-email-silbe@linux.vnet.ibm.com> References: <1471551152-26107-1-git-send-email-silbe@linux.vnet.ibm.com> Message-Id: <1471551152-26107-4-git-send-email-silbe@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 3/3] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, Fam Zheng The debian-bootstrap image doesn't choose a default architecture and distribution version, instead the user has to set both DEB_ARCH and DEB_TYPE in the environment. Print a reasonably helpful message if either of them isn't set instead of complaining about "qemu-" being missing or erroring out because we cannot cd to the mirror URL. Signed-off-by: Sascha Silbe --- I haven't figured out a good way to warn about qemu-user-* being missing because EXECUTABLE isn't set. debian-bootstrap.pre runs before docker.py copies the executable so I cannot check in debian-bootstrap.pre whether the binfmt interpreter exists. The EXECUTABLE environment variable needs to be set only when run via make, so checking it in debian-bootstrap.pre is no good either. And an additional docker-image-debian-bootstrap rule in the Makefile that checks if EXECUTABLE is set would override the regular rule, not enhance it. tests/docker/dockerfiles/debian-bootstrap.pre | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index 5d9c8d5..2ae363f 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -15,6 +15,19 @@ exit_and_skip() if [ -z $FAKEROOT ]; then echo "Please install fakeroot to enable bootstraping" exit_and_skip + +fi + +if [ -z "${DEB_ARCH}" ]; then + echo "Please set DEB_ARCH to choose an architecture (e.g. armhf)" + exit_and_skip + +fi + +if [ -z "${DEB_TYPE}" ]; then + echo "Please set DEB_TYPE to a Debian archive name (e.g. testing)" + exit_and_skip + fi # We check in order for -- 1.9.1