From patchwork Tue Feb 14 10:07:32 2017 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: 93944 Delivered-To: patch@linaro.org Received: by 10.140.20.99 with SMTP id 90csp1488633qgi; Tue, 14 Feb 2017 02:12:49 -0800 (PST) X-Received: by 10.200.42.66 with SMTP id l2mr25816292qtl.33.1487067169213; Tue, 14 Feb 2017 02:12:49 -0800 (PST) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r3si63782qkb.46.2017.02.14.02.12.48 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Feb 2017 02:12:49 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda6I-0001X0-QN for patch@linaro.org; Tue, 14 Feb 2017 05:12:46 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55727) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cda12-00063y-Uf for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cda10-0008N2-Qo for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:20 -0500 Received: from mail-wr0-x232.google.com ([2a00:1450:400c:c0c::232]:34954) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cda10-0008Ma-KC for qemu-devel@nongnu.org; Tue, 14 Feb 2017 05:07:18 -0500 Received: by mail-wr0-x232.google.com with SMTP id c4so8432631wrd.2 for ; Tue, 14 Feb 2017 02:07:18 -0800 (PST) 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=pLzb3G5b6qPqu3N8HmJOX8e9Ey5OWfcDJozblCnuXeg=; b=bd5aP8gnXN7lgxWG5w1ul0wwnyjl7YnTtdLOqCi1/1BF0B9w70/+lGrxVWxb9vJBGZ bDnXM3DxySVkLW0ONKZPM4ayoNqZCVMjpcO38b+reSIWB3VDCLcRMrddRIvjAlLlRD7H dvsoGsVokgYfDw+S1qGEV+NkajNANy0VDKMvc= 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=pLzb3G5b6qPqu3N8HmJOX8e9Ey5OWfcDJozblCnuXeg=; b=kbcI8IpJGmKIKapcqs/k1SNQcFaZFd4ZtqFDJb3V6JF/s14dJGUfFKRNmmeeMDiPb5 vG2sSh2mDwOtJawSYuVcxrTxbkYCNc6U/Y/z3iXW65ZxSUzkWOzG7uWOY6cqSKC/L0ff 8DOcrPsh1aVc50+Vhme5uOOdFzQh0kNeipSLEXBzXm9FxgdMtzLn9hIMW1Nx3xoAESbU hrvdshALnaKScw/9EdA+gMrsm6TxxlL5EIq9tH7reNcdm3ZS8aufjfyq85C0P+TMG/DN Q26iL/TAXi3Umc1dHEiDvyQ5qLWyt27Rkt2tdxeixq2SptrlB7Vr3tQrnSwqBrqexqcW fLSA== X-Gm-Message-State: AMke39mWgKsUHlHu3bWUCa+vk9vBrcXRHU6hmaNjfJlOlaLJEhKLytk6rIyWYS3jNT7rx95l X-Received: by 10.223.133.164 with SMTP id 33mr24557014wrt.39.1487066837553; Tue, 14 Feb 2017 02:07:17 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m80sm569376wmi.34.2017.02.14.02.07.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 02:07:15 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id D8FD53E0A8C; Tue, 14 Feb 2017 10:07:33 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: famz@redhat.com Date: Tue, 14 Feb 2017 10:07:32 +0000 Message-Id: <20170214100733.22280-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170214100733.22280-1-alex.bennee@linaro.org> References: <20170214100733.22280-1-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:c0c::232 Subject: [Qemu-devel] [PATCH v3 2/3] new: debian docker targets for cross-compiling 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_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This provides a basic Debian install with access to the emdebian cross compilers. The debian-armhf-cross and debian-arm64-cross targets build on the basic Debian image to allow cross compiling to those targets. To build against the cross compiler a cross-compile prefix needs to be set in the configure options, for example: make docker-test-build@debian-arm64-cross \ EXTRA_CONFIGURE_OPTS="--cross-prefix=aarch64-linux-gnu-" \ TARGET_LIST="aarch64-softmmu,aarch64-linux-user" Signed-off-by: Alex Bennée --- v2 - add clang (keep shippable happy) - rm adduser code (done direct now) - add aptitude (useful for debugging package clashes) v3 - split into debian, debian-armhf-cross and debian-aarch64-cross --- tests/docker/Makefile.include | 4 ++++ tests/docker/dockerfiles/debian-arm64-cross.docker | 12 +++++++++++ tests/docker/dockerfiles/debian-armhf-cross.docker | 12 +++++++++++ tests/docker/dockerfiles/debian.docker | 25 ++++++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-arm64-cross.docker create mode 100644 tests/docker/dockerfiles/debian-armhf-cross.docker create mode 100644 tests/docker/dockerfiles/debian.docker -- 2.11.0 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 8db55e43aa..dbd12d9042 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -54,6 +54,10 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker $(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\ "BUILD","$*") +# Enforce dependancies for composite images +docker-image-debian-armhf-cross: docker-image-debian +docker-image-debian-arm64-cross: docker-image-debian + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker new file mode 100644 index 0000000000..04212629f7 --- /dev/null +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -0,0 +1,12 @@ +# +# Docker arm64 cross-compiler target +# +# This docker target builds on the base debian image. +# +FROM qemu:debian + +# Add the foreign architecture we want and install dependacies +RUN dpkg --add-architecture arm64 +RUN apt update +RUN apt install -yy crossbuild-essential-arm64 +RUN apt-get build-dep -yy -a arm64 qemu diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker new file mode 100644 index 0000000000..1377641e3e --- /dev/null +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -0,0 +1,12 @@ +# +# Docker armhf cross-compiler target +# +# This docker target builds on the base debian image. +# +FROM qemu:debian + +# Add the foreign architecture we want and install dependacies +RUN dpkg --add-architecture armhf +RUN apt update +RUN apt install -yy crossbuild-essential-armhf +RUN apt-get build-dep -yy -a armhf qemu diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker new file mode 100644 index 0000000000..52bd79938e --- /dev/null +++ b/tests/docker/dockerfiles/debian.docker @@ -0,0 +1,25 @@ +# +# Docker multiarch cross-compiler target +# +# This docker target is builds on Debian and Emdebian's cross compiler targets +# to build distro with a selection of cross compilers for building test binaries. +# +# On its own you can't build much but the docker-foo-cross targets +# build on top of the base debian image. +# +FROM debian:stable-slim + +# Setup some basic tools we need +RUN apt update +RUN apt install -yy curl aptitude + +# Setup Emdebian +RUN echo "deb http://emdebian.org/tools/debian/ jessie main" >> /etc/apt/sources.list +RUN curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add - + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list + +# Install common build utilities +RUN apt update +RUN apt install -yy build-essential clang