From patchwork Tue Jul 18 00:31:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 789803 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xBM3M4T5rz9t1Z for ; Tue, 18 Jul 2017 10:48:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="VaLo8HuY"; dkim-atps=neutral Received: from localhost ([::1]:53249 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXGgf-0006RX-FW for incoming@patchwork.ozlabs.org; Mon, 17 Jul 2017 20:48:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34494) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dXGSQ-0001in-RW for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:33:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dXGSP-0005ZH-HP for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:33:46 -0400 Received: from mail-qt0-x236.google.com ([2607:f8b0:400d:c0d::236]:33334) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dXGSP-0005Z3-Bv for qemu-devel@nongnu.org; Mon, 17 Jul 2017 20:33:45 -0400 Received: by mail-qt0-x236.google.com with SMTP id n42so4466809qtn.0 for ; Mon, 17 Jul 2017 17:33:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f3L2V5wONrlqjTyn08G/gv6tRKGiAUY18z/eSY9bwwk=; b=VaLo8HuY86Iamf7pumm5gQn69bMlzHU8fuhZYv3I1fjwuxFosJbYUfX6vYhXmILhyk yXSYMhrhbroZqVXnjoJ68DB3wpTIS0I9IQKm9QzDtqIQgO7xwkGbpGJ1GrsyQqorlT0U AFaP7ZV0l45F8kISjJjmolQQj3tWnOmOlqosBlmdXh76tdE7GeP0NrFziGoL425qPP95 VMYtl3oDlQE9jSEyv+TCHOoALVFb2YA/CvhCKEX6Yx2bWB1cYDhB139HcpzJp6U8NqUV U0PEzePYiyflHT1wO1EyY4HuHHrri2JlTytWBSt1Zm7R9QuOfCfHbyFBoskpaxGZAMvU k0aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=f3L2V5wONrlqjTyn08G/gv6tRKGiAUY18z/eSY9bwwk=; b=MpbKQTn9Uck+bxhPM01SluZmVk99AxM2+bYO7UM7659AWBz+bF7h1qttk8ZCASkjp1 TA03Sfbaxw5KBt9KZjv3EPXHR0moeCpILY2h+P60PSoqwJMXLH7zM/Vcjc7rdTjfiO9H yOvYz2pAdNDFxS4hShukL6OGhaZU0eQkR4RnW72fQZEUCW3Hd1b8To5cGiis74fAMRqH OR/cMpoFSbC/KcfoqjKeiQ2YJxBR0u5777evt/jLAO2ZLBqC4oXPmZae5WejpIrp96dO z3fVt2/UtKyb41+23J/ydPUlONToMUaHLBe+2hBJD6CkwQcE3/Q0PoKtI3geP5WvHngF EGEg== X-Gm-Message-State: AIVw110mUoScMPGtcyKgPRSKJSoNdJTqlXC+JbeLBicf9usrWF+JroOr 1xICvDVG6AfFKg== X-Received: by 10.200.34.248 with SMTP id g53mr254531qta.65.1500338024743; Mon, 17 Jul 2017 17:33:44 -0700 (PDT) Received: from yoga.offpageads.com ([138.117.48.223]) by smtp.gmail.com with ESMTPSA id d14sm548638qtc.58.2017.07.17.17.33.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 17:33:43 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Fam Zheng , Peter Maydell Date: Mon, 17 Jul 2017 21:31:57 -0300 Message-Id: <20170718003159.10200-30-f4bug@amsat.org> X-Mailer: git-send-email 2.13.2 In-Reply-To: <20170718003159.10200-1-f4bug@amsat.org> References: <20170717144848.11793-1-alex.bennee@linaro.org> <20170718003159.10200-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::236 Subject: [Qemu-devel] [PATCH v2 29/31] docker: add MXE (M cross environment) base image for MinGW-w64 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?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" see http://mxe.cc/ Signed-off-by: Philippe Mathieu-Daudé --- tests/docker/Makefile.include | 3 ++ tests/docker/dockerfiles/debian-win32-cross.docker | 32 ++++++++++++++++++++++ tests/docker/dockerfiles/debian-win64-cross.docker | 32 ++++++++++++++++++++++ tests/docker/dockerfiles/debian8-mxe.docker | 18 ++++++++++++ 4 files changed, 85 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-win32-cross.docker create mode 100644 tests/docker/dockerfiles/debian-win64-cross.docker create mode 100644 tests/docker/dockerfiles/debian8-mxe.docker diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 5a8283674a..e993e149e7 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -58,6 +58,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh # Enforce dependancies for composite images +docker-image-debian8-mxe: docker-image-debian8 docker-image-debian-amd64: docker-image-debian9 docker-image-debian-armel-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9 @@ -67,6 +68,8 @@ docker-image-debian-mips64el-cross: docker-image-debian9 docker-image-debian-powerpc-cross: docker-image-debian8 docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 +docker-image-debian-win32-cross: docker-image-debian8-mxe +docker-image-debian-win64-cross: docker-image-debian8-mxe # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(DOCKER_IMAGES), \ diff --git a/tests/docker/dockerfiles/debian-win32-cross.docker b/tests/docker/dockerfiles/debian-win32-cross.docker new file mode 100644 index 0000000000..a628601f6d --- /dev/null +++ b/tests/docker/dockerfiles/debian-win32-cross.docker @@ -0,0 +1,32 @@ +# +# Docker mingw32 cross-compiler target +# +# This docker target builds on the debian Jessie MXE base image. +# +FROM qemu:debian8-mxe + +MAINTAINER Philippe Mathieu-Daudé + +ENV TARGET i686 + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + mxe-$TARGET-w64-mingw32.shared-bzip2 \ + mxe-$TARGET-w64-mingw32.shared-curl \ + mxe-$TARGET-w64-mingw32.shared-glib \ + mxe-$TARGET-w64-mingw32.shared-libgcrypt \ + mxe-$TARGET-w64-mingw32.shared-libssh2 \ + mxe-$TARGET-w64-mingw32.shared-libusb1 \ + mxe-$TARGET-w64-mingw32.shared-lzo \ + mxe-$TARGET-w64-mingw32.shared-nettle \ + mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-pixman \ + mxe-$TARGET-w64-mingw32.shared-pkgconf \ + mxe-$TARGET-w64-mingw32.shared-pthreads \ + mxe-$TARGET-w64-mingw32.shared-sdl2 \ + mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ + mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ + mxe-$TARGET-w64-mingw32.shared-zlib + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=$TARGET-w64-mingw32.shared- diff --git a/tests/docker/dockerfiles/debian-win64-cross.docker b/tests/docker/dockerfiles/debian-win64-cross.docker new file mode 100644 index 0000000000..32b1da0a34 --- /dev/null +++ b/tests/docker/dockerfiles/debian-win64-cross.docker @@ -0,0 +1,32 @@ +# +# Docker mingw64 cross-compiler target +# +# This docker target builds on the debian Jessie MXE base image. +# +FROM qemu:debian8-mxe + +MAINTAINER Philippe Mathieu-Daudé + +ENV TARGET x86-64 + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + mxe-$TARGET-w64-mingw32.shared-bzip2 \ + mxe-$TARGET-w64-mingw32.shared-curl \ + mxe-$TARGET-w64-mingw32.shared-glib \ + mxe-$TARGET-w64-mingw32.shared-libgcrypt \ + mxe-$TARGET-w64-mingw32.shared-libssh2 \ + mxe-$TARGET-w64-mingw32.shared-libusb1 \ + mxe-$TARGET-w64-mingw32.shared-lzo \ + mxe-$TARGET-w64-mingw32.shared-nettle \ + mxe-$TARGET-w64-mingw32.shared-ncurses \ + mxe-$TARGET-w64-mingw32.shared-pixman \ + mxe-$TARGET-w64-mingw32.shared-pkgconf \ + mxe-$TARGET-w64-mingw32.shared-pthreads \ + mxe-$TARGET-w64-mingw32.shared-sdl2 \ + mxe-$TARGET-w64-mingw32.shared-sdl2-mixer \ + mxe-$TARGET-w64-mingw32.shared-sdl2-gfx \ + mxe-$TARGET-w64-mingw32.shared-zlib + +# Specify the cross prefix for this image (see tests/docker/common.rc) +ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32.shared- diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker new file mode 100644 index 0000000000..ffebf485c0 --- /dev/null +++ b/tests/docker/dockerfiles/debian8-mxe.docker @@ -0,0 +1,18 @@ +# +# Docker mingw cross-compiler target +# +# This docker target builds on the debian Jessie base image. +# +FROM qemu:debian8 + +MAINTAINER Philippe Mathieu-Daudé + +# Add the foreign architecture we want and install dependencies +RUN http_proxy= apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE9643FE1AFD8FFF16DB45C6AB && \ + echo "deb http://pkg.mxe.cc/repos/apt/debian jessie main" > /etc/apt/sources.list.d/mxeapt.list +RUN apt-get update +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + $(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2) + +ENV PATH $PATH:/usr/lib/mxe/usr/bin/