From nobody Wed Nov 5 08:45:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530542869414105.35069042934936; Mon, 2 Jul 2018 07:47:49 -0700 (PDT) Received: from localhost ([::1]:33241 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fa07I-0002Ff-Mu for importer@patchew.org; Mon, 02 Jul 2018 10:47:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58301) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fZzxw-00035J-Pj for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fZzxv-0005FI-7x for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:08 -0400 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:36884) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fZzxv-0005EI-0d for qemu-devel@nongnu.org; Mon, 02 Jul 2018 10:38:07 -0400 Received: by mail-wm0-x243.google.com with SMTP id n17-v6so9010616wmh.2 for ; Mon, 02 Jul 2018 07:38:06 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 131-v6sm20364866wmm.31.2018.07.02.07.38.00 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Jul 2018 07:38:02 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 249FF3E0B6C; Mon, 2 Jul 2018 15:30:23 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=yz6i5tqzWoXvLEggjJPEYg+DnnCR4zEmF2RbxVVKK2I=; b=dg9NWlbirBxdH7sou+N+kJ5J/+sbwTreDwnSLtFyNenSmAXS0LOHOIElRtkMTggCwu p7k1xQBtFziJkDsxM3+r0uIAj8AtsBEQv4nFsFJFmDNfj+nrrEdrl4kgvqmkHwIM0iHW pm58RiNJRqRbJl1u91q/d40TroS9XwpqKflQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yz6i5tqzWoXvLEggjJPEYg+DnnCR4zEmF2RbxVVKK2I=; b=Rjpmqa1vxgF07+ivbIcqdYbYOIjzP85EyHIK466br3pyifnHCdpjNW5VUkrHZWEiV6 lzjLsJJbTdOmXE02fCGI7XVqU1u0oKjS/SGVwIgxf5USnxrwMeWuqTm5AUiyVCmIbDr5 yUyD99/BIqFkDbCbXDaTaGQLmrdvzQGy4X++xH44Xt2QUnAzQdlsDZV0ucOxL+DRNYDn qlfviRUcbK+9559iR0i6OZBxP9g7vp8K+Y52l8IwXJNYa43x3VsGurkJbIAKp9epHTs8 YMOJ76ESu+9iuawlJVlf63NgTtkHpQavtn02d1wopbQzPB3ioArr3lAMQjQv7/Kv82Is PkmA== X-Gm-Message-State: APt69E27tSOtxBzoyqPwbX9hr2x5IEfPdtgGSj8B/FR4orFoh+N5umNy wpASy39Mj4THKo3GaKK0082ubw== X-Google-Smtp-Source: AAOMgpeA5+QgAKuXHL9K4hIMUri6P9kTPPQUdZdcUwuHiIZqkwpkcQug8xecYwRM+zYwbYqeBQmDFg== X-Received: by 2002:a1c:c90:: with SMTP id 138-v6mr8054187wmm.110.1530542285841; Mon, 02 Jul 2018 07:38:05 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: Mon, 2 Jul 2018 15:30:18 +0100 Message-Id: <20180702143021.18864-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org> References: <20180702143021.18864-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pbonzini@redhat.com, =?UTF-8?q?Alex=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We default to the buildd variant as most of our images are for building. However lets give the user the ability to specify "minbase" if they want to create a simple base image for experimentation. Allowing the tweaking of DEB_URL means we can also bootstrap other Debian based OS's. For example: make docker-binfmt-image-debian-ubuntu-bionic-arm64 \ DEB_ARCH=3Darm64 DEB_TYPE=3Dbionic \ DEB_VARIANT=3Dminbase DEB_URL=3Dhttp://ports.ubuntu.com/ \ EXECUTABLE=3D./aarch64-linux-user/qemu-aarch64 Signed-off-by: Alex Benn=C3=A9e Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/debian-bootstrap.pre | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/d= ockerfiles/debian-bootstrap.pre index 7c76dce663..56e1aa7a21 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -32,6 +32,15 @@ if [ -z "${DEB_TYPE}" ]; then =20 fi =20 +# The following allow finer grain control over the defaults +if [ -z "${DEB_VARIANT}" ]; then + DEB_VARIANT=3Dbuildd +fi + +if [ -z "${DEB_URL}" ]; then + DEB_URL=3D"http://httpredir.debian.org/debian" +fi + # We check in order for # # - DEBOOTSTRAP_DIR pointing at a development checkout @@ -107,5 +116,5 @@ fi =20 echo "Building a rootfs using ${FAKEROOT} and ${DEBOOTSTRAP} ${DEB_ARCH}/$= {DEB_TYPE}" =20 -${FAKEROOT} ${DEBOOTSTRAP} --variant=3Dbuildd --foreign --arch=3D$DEB_ARCH= $DEB_TYPE . http://httpredir.debian.org/debian || exit 1 +${FAKEROOT} ${DEBOOTSTRAP} --variant=3D$DEB_VARIANT --foreign --arch=3D$DE= B_ARCH $DEB_TYPE . $DEB_URL || exit 1 exit 0 --=20 2.17.1