From patchwork Tue Jun 28 15:42:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 9203499 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 279776075F for ; Tue, 28 Jun 2016 15:58:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 19473285D1 for ; Tue, 28 Jun 2016 15:58:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0E174285E6; Tue, 28 Jun 2016 15:58:52 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 81AE0285D1 for ; Tue, 28 Jun 2016 15:58:51 +0000 (UTC) Received: from localhost ([::1]:37761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHvPW-0000l9-LM for patchwork-qemu-devel@patchwork.kernel.org; Tue, 28 Jun 2016 11:58:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHvA7-000894-SD for qemu-devel@nongnu.org; Tue, 28 Jun 2016 11:42:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bHvA5-0002U0-M2 for qemu-devel@nongnu.org; Tue, 28 Jun 2016 11:42:54 -0400 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]:38580) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bHvA5-0002Tl-FL for qemu-devel@nongnu.org; Tue, 28 Jun 2016 11:42:53 -0400 Received: by mail-wm0-x236.google.com with SMTP id r201so33913389wme.1 for ; Tue, 28 Jun 2016 08:42:53 -0700 (PDT) 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=hPDlWzsMrsOVq9ZfHzRc4BWeh634a8ryziVD0+KIvIc=; b=bBPvwC+xkzsyQxF7G6MZTw4QtqGles35HrCu+U739MoG+zdKbWBDVJGkDPBeuKXbEH jEF/KBsvhcIf7cXNZU82PKINm16VIVkBDSSgplIBRb0G0k2F91vhTSO77hM4oRGa3pyA 4ufkk+6bztG/JX7kyGwz+AjPsDCf6Q14LHLoQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hPDlWzsMrsOVq9ZfHzRc4BWeh634a8ryziVD0+KIvIc=; b=Xdvze5JhhiD0FUppeVGKSLoB3lrNFwkeuxRnGyrafRGokddwbnCioTm/sjapxwA1cH 0WK8ZCcrNH4v07y1U+mZzBOc9iZSA/Ew36DVteZsUEJpGrZ7hVyCyZxlJGm2Bfdx5NLs TpKCGRUW2PPvlb2srIEOEqk9CvPJTncXEIj3hFVQgkcA/5jCR9jNpTfKOgl6sigzSG3b wFO2q0mnrTfuG7Au40ewVvYfWYnnwHyHIiiSqx8KMWa6/PPP+1StMS3WT2tMmKXcoDGP Uao1+TWd0BYjO/xVJ6zWkR/3TGV97ieDI9aG5+uMFeq4qMt7ZFkdDzxnqACCHVXwe9KO 9Wfw== X-Gm-Message-State: ALyK8tIANQOLCYT732cq2vqQ2eeJTrNSeOoZn/LOn291yr/Bbyfod8gLagCj6INFAooushwA X-Received: by 10.194.117.35 with SMTP id kb3mr4065825wjb.136.1467128572624; Tue, 28 Jun 2016 08:42:52 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d192sm170449wmd.14.2016.06.28.08.42.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Jun 2016 08:42:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 3E5B33E0501; Tue, 28 Jun 2016 16:42:54 +0100 (BST) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 28 Jun 2016 16:42:43 +0100 Message-Id: <1467128564-13476-5-git-send-email-alex.bennee@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1467128564-13476-1-git-send-email-alex.bennee@linaro.org> References: <1467128564-13476-1-git-send-email-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::236 Subject: [Qemu-devel] [PATCH v3 4/5] tests/docker/dockerfiles: new debian-bootstrap.docker 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: =?UTF-8?q?Alex=20Benn=C3=A9e?= , riku.voipio@linaro.org, famz@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Together with the debian-bootstrap.pre script can now build an arbitrary architecture of Debian using debootstrap. This allows debootstrap to set up its first stage before the container is built. To build a container you need a command line like: DEB_ARCH=armhf DEB_TYPE=testing \ ./tests/docker/docker.py build \ --include-executable=arm-linux-user/qemu-arm debian:armhf \ ./tests/docker/dockerfiles/debian-bootstrap.docker Signed-off-by: Alex Bennée --- v2 - use .pre script instead of embedded HOST_CMD - make default image include all QEMU build-deps v3 - split docker.py from introduction of bootstrap --- tests/docker/dockerfiles/debian-bootstrap.docker | 21 +++++++++++++++++++++ tests/docker/dockerfiles/debian-bootstrap.pre | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-bootstrap.docker create mode 100755 tests/docker/dockerfiles/debian-bootstrap.pre diff --git a/tests/docker/dockerfiles/debian-bootstrap.docker b/tests/docker/dockerfiles/debian-bootstrap.docker new file mode 100644 index 0000000..3a9125e --- /dev/null +++ b/tests/docker/dockerfiles/debian-bootstrap.docker @@ -0,0 +1,21 @@ +# Create Debian Bootstrap Image +# +# This is intended to be pre-poluated by: +# - a first stage debootstrap (see debian-bootstrap.pre) +# - a native qemu-$arch that binfmt_misc will run +FROM scratch + +# Add everything from the context into the container +ADD . / + +# Patch all mounts as docker already has stuff set up +RUN sed -i 's/in_target mount/echo not for docker in_target mount/g' /debootstrap/functions + +# Run stage 2 +RUN /debootstrap/debootstrap --second-stage + +# At this point we can install additional packages if we want +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list +RUN apt-get update +RUN apt-get -y build-dep qemu diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre new file mode 100755 index 0000000..6f42da6 --- /dev/null +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -0,0 +1,5 @@ +#!/bin/sh +# +# Simple wrapper for debootstrap, run in the docker build context +# +fakeroot debootstrap --variant=buildd --foreign --arch=$DEB_ARCH $DEB_TYPE . http://httpredir.debian.org/debian