From patchwork Wed Jul 18 10:04:56 2018 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: 142258 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346939ljj; Wed, 18 Jul 2018 03:08:43 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdGV2X+UwF9STYNruRvQ/4/qL7lRIYOfKze4fFh7C7fcTb0k08LmnITH4pdEPu5xh27b0F0 X-Received: by 2002:aed:2561:: with SMTP id w30-v6mr4761763qtc.240.1531908523832; Wed, 18 Jul 2018 03:08:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908523; cv=none; d=google.com; s=arc-20160816; b=uwq1yApoES4IHH8otOAyuS2Ckava3k5hKKBgq2D+DQvBsbRAChu849Agon17IRBtRv y9AHbS7L0ARRzP0ppaeJ4yxr9/EePla517bEYORQdb6NDjcsvsxiNnBOuLHZ9j0AVpm9 MvFjcXQ8HrFzXOGUehsMM/zUnm4sVVHBwABdXyDAIMh8PGl64B+BNeW7fuG8cmqdGZBZ ruSGXAWGa56ru8CblsheyM6RNNKG9cEdu+Vptj1rBwqEu6IwRm9yN44uKhoYJLRq4Z28 sW2ZI8VcvUeThjXuMoi70UXS6D3jxM2HFmtlYc6JM77nQ0dfMr6gaCsmNEiQkrklyEir 04iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=SKlok05sCxhkFlPkY/MiMQwjFkuwYgrXDiOCw82vTA7UCFg1V34D8fzNdTNy9Yzd2p eAJpd+Pd5ZqeZml+5kMTN8h8h4I6FE1EgWhDp+8VO0/8bn7eg32e4YjWSeUlnI2lEJay FSI+IMpP2J4yIavNDIcoXS8Rt56w1xLJCXlpYdPMN+ztolbJOWD1i1Hl/u3hLDHIyHbN 4b/z12XT/d1rgvviM+KXsPL0wm/K5A9LSe2J3514A3Fcy3Y3rMhaFRZ9HjTfvVnwlbP+ 9BE+rZosVVdeE01oTDAXXnzWm5dUmJRPzNes85Ad03wS5iFUBQbPmoC/VKzMdvtHRKgk kYCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=HlT7WArG; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v57-v6si3043182qtk.315.2018.07.18.03.08.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:43 -0700 (PDT) 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 header.s=google header.b=HlT7WArG; 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]:35676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNz-0005Y5-Bj for patch@linaro.org; Wed, 18 Jul 2018 06:08:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55394) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKa-00038V-OE for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKW-00010H-EN for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:12 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41683) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKW-0000zl-7l for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:08 -0400 Received: by mail-wr1-x442.google.com with SMTP id j5-v6so4038581wrr.8 for ; Wed, 18 Jul 2018 03:05:08 -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=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=HlT7WArGtKIH+G7ozBTYz3Y+uRg81JhnagCSGDvf1eWZz3fV9UOG6zt1UKATWFJQlw D4+l7JniFP0W5iqN4T9oeTTj2M58aXEJLzet30t+PtRm7zs5cUQ6yL11T7wotePb+gw/ n6Jh5CuiC3fzv1vzQQDdF8+7kircdEM3YttfA= 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=LRI1kkKXd2sk8p7d7x3gJ0UIN85k1+U60Z57M/aOqpc=; b=W7FOyAj26tlugbcUT1koSIXy0pd8A3LF/ebwCdcgvY587/9w5FkChgPgu+kK4ITn2P wcib7d2yL/rY7elcO+V+YTEvP86W/hEWsuAlmekdGff49oL0ppTHlybRowcNmBM81IjT /qbLe8Qk4pIw1KzsG3hyPYTMq5UUb/NZRl+zLwJIlxUjePu+zVtsapPpZcNTl0ohvTge IgvWb5IdtBTwhC42zYN8kAoiWB6AtoAMSnGccXa+oJX3gkTvBWmNIwEmBrJr3ycKpdXm ZydOP4uG4TCoQ5FcCH4TT9AVwO6NntJJQluoh4X9seixvJn31CA79qEcfkMWX9ryvVFP fm0w== X-Gm-Message-State: AOUpUlGZXY+7VBapPaS13oYCQeqvkmmE5MxD+VQ6PLUM58aO7zCUfH6I Hv3nR5CZsXhsvO3xBwBcjSDELw== X-Received: by 2002:adf:c08c:: with SMTP id d12-v6mr3766526wrf.268.1531908307166; Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n8-v6sm3658228wrt.56.2018.07.18.03.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:05 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 46FA33E02A5; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:04:56 +0100 Message-Id: <20180718100505.7546-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH RFC 01/10] docker: rename docker-amd64 to docker-host 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" When building on non-x86 systems the base system will be correct so if we avoid too many x86'isms in the install we can still use the image. Signed-off-by: Alex Bennée --- .../dockerfiles/{debian-amd64.docker => debian-host.docker} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename tests/docker/dockerfiles/{debian-amd64.docker => debian-host.docker} (91%) -- 2.17.1 diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/dockerfiles/debian-host.docker similarity index 91% rename from tests/docker/dockerfiles/debian-amd64.docker rename to tests/docker/dockerfiles/debian-host.docker index eb13f06ed1..3605cc4658 100644 --- a/tests/docker/dockerfiles/debian-amd64.docker +++ b/tests/docker/dockerfiles/debian-host.docker @@ -30,9 +30,9 @@ RUN cd /usr/src/virglrenderer && ./autogen.sh && ./configure --with-glx --disabl # netmap RUN DEBIAN_FRONTEND=noninteractive eatmydata \ apt-get install -y --no-install-recommends \ - linux-headers-amd64 + linux-headers-$(dpkg --print-architecture) RUN git clone https://github.com/luigirizzo/netmap.git /usr/src/netmap -RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*-amd64) && make install +RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kernel-dir=$(ls -d /usr/src/linux-headers-*) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap # gcrypt From patchwork Wed Jul 18 10:04:57 2018 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: 142255 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346594ljj; Wed, 18 Jul 2018 03:08:18 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfNeYpQNwIu65jWVagPBLqjJdzp4YoNQoJGh8a6n6RAJQryXK1p3IV1E9XyCgPwbLIWN9Im X-Received: by 2002:a37:d61b:: with SMTP id t27-v6mr4521083qki.244.1531908498120; Wed, 18 Jul 2018 03:08:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908498; cv=none; d=google.com; s=arc-20160816; b=nV3/nMs5QNjovyoPeLwkBGy24OcujUGov3wF6u+MK9N4C95IsEvJrEucu1LrBUIriD lWl5PR3Qs0celVYYFGhdJM9FwZkfakoEpPNKTkWw/vUYVXp10BqLEH2FyLxganAK/vfG BGMDKJS4Lat1SeG48g5eOcoyrWEBdEwHO58AHXVAjSOHfdOf7C2dwxNKYxaHbEo1M7K2 fqxblt+5eEw+ObZJhhYpspas+RAvjf5PlhEBakMbciC0iT9i+FvhD2av3F51kPKEXnhe g1xK6xNYbvkibUn633UjmHt3KvuSPncYdTqAS/0m8KUyNjAhljcRpRPRWMMoicy5dCJ9 F7Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=G+nZmE+F8aAuNfGNgT6RGoIrTIUcQFwxF8CDhukBUXk=; b=aPHff50zocbsO805q+F8HfHh3w/RGTE4ubhXbhe566GYEU+iOkykJXdi2/xrdACbZm thefhCnHVF/Pct/mFXg8HAgkYcU4S6THU0BhYyh03ME2rcxHgyXNYECYzbs2tK/Nlt8J ZXN1+USqk8+CZmsc/LueiyY37UfzdXVlSvYQw1MBQfmhbi1egT7n9c1WASipI4fa/1D7 s72i8TK9Iy0Nx6y4axHm07wNm4t5gAokds7sfrRWXhlmwBzXBwI1YSCaU3SVqrCbAbb6 J6qtP3HQ0t5xmE2snnMwmK65hjVuhse1InANcxxXqOxoqTPfJrHOHqY5Tk6vLnQb6rYL g6ww== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=MVie75hk; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id m60-v6si3808780qva.9.2018.07.18.03.08.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:18 -0700 (PDT) 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 header.s=google header.b=MVie75hk; 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]:35669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNZ-0004OL-J6 for patch@linaro.org; Wed, 18 Jul 2018 06:08:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55368) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKZ-00038K-HO for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKX-00011K-KW for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:11 -0400 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]:33206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKX-00010a-DQ for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:09 -0400 Received: by mail-wm0-x241.google.com with SMTP id z6-v6so14663207wma.0 for ; Wed, 18 Jul 2018 03:05:09 -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=G+nZmE+F8aAuNfGNgT6RGoIrTIUcQFwxF8CDhukBUXk=; b=MVie75hkYDtep/gB5jxazvO15hcn1VTYB7VCJv8mFFSXpMyA/ut3PJfllvTHvgIMYB LB+CnaT1GstJ2CJVQ/4vtOyVbbN8YGqx9g2IkhGQFsFExQVH2QOLTyh2RdunqK6mJnP/ 3XG8UI1r+c1aCtPfBfLOcZc4ekwqmqeH+ewYc= 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=G+nZmE+F8aAuNfGNgT6RGoIrTIUcQFwxF8CDhukBUXk=; b=ggWynbN6CSyI1F2Kv2s5AqiTxUXK6RniIEzIPAB4QGJ5w9FEBu9bEdR0qfMi/+czky rhn44c9Z9BvomLi+E3ghQk/bZXcQhW9j99aWx/mnm80b/rybsMnCL2sjjmlhLatO01p7 Z05Jjv4dyF77y1S/A0QLBgQ2jgYA8QmqLqo0Vt1ETP0TdNw1vFd9uWXtgMUgQ+qs6n8m EbuqIIRs/Mi4AcQtZbvhN6lbGOxzDjBmPNaR1zmVECJXMEERloy9CCA4jiaDkmyn0ERJ 0bgcbFvA3ABuIKxGl8/A5435uGRe+xQhRtH/hFe9RCkodzTPDdAmXeEnEaWZ6B2dbyDi YMdg== X-Gm-Message-State: AOUpUlH755/wP+sZjxel6AcY42Cyi6cflX4bW4pCjck7gUdUKcV98lrU hVM0qTkGVk+jcm/mtxItz9jJag== X-Received: by 2002:a1c:14c3:: with SMTP id 186-v6mr1088184wmu.21.1531908308354; Wed, 18 Jul 2018 03:05:08 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f18-v6sm3864536wrt.64.2018.07.18.03.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 59D4C3E04A5; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:04:57 +0100 Message-Id: <20180718100505.7546-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::241 Subject: [Qemu-devel] [PATCH RFC 02/10] docker: change docker-image to docker-all-images target 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" We also evaluate this list later in the build rule after all decisions about what will and won't be built have been made. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index c9e412f9d0..22adf6ac73 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -8,7 +8,6 @@ DOCKER_DEPRECATED_IMAGES := debian # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES := debian debian8 debian9 debian8-mxe debian-ports debian-sid debian-bootstrap DOCKER_IMAGES := $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) -DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR := $$HOME/.cache/qemu-docker-ccache @@ -34,8 +33,6 @@ $(DOCKER_SRC_COPY): docker-qemu-src: $(DOCKER_SRC_COPY) -docker-image: ${DOCKER_TARGETS} - # General rule for building docker images. If we are a sub-make # invoked with SKIP_DOCKER_BUILD we still check the image is upto date # though @@ -154,6 +151,10 @@ $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPR ) \ ) +# Expand a rule to build all useable images +DOCKER_TARGETS := $(patsubst %,docker-image-%,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES))) +docker-all-images: $(DOCKER_TARGETS) + docker: @echo 'Build QEMU and run tests inside Docker containers' @echo @@ -167,7 +168,7 @@ docker: @echo ' Note: "TEST" is one of the listed test name,' @echo ' or a script name under $$QEMU_SRC/tests/docker/;' @echo ' "IMAGE" is one of the listed container name."' - @echo ' docker-image: Build all images.' + @echo ' docker-all-images: Build all images.' @echo ' docker-image-IMAGE: Build image "IMAGE".' @echo ' docker-run: For manually running a "TEST" with "IMAGE"' @echo From patchwork Wed Jul 18 10:04:58 2018 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: 142253 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp344231ljj; Wed, 18 Jul 2018 03:05:46 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeX9WcBfAJLt2hzjY7W0mNCEN2E1wL8XUlbJJEHcL6K1pHZjuclLHC0TLA/9lDfZMKa1ynq X-Received: by 2002:a37:8742:: with SMTP id j63-v6mr4629520qkd.353.1531908346001; Wed, 18 Jul 2018 03:05:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908345; cv=none; d=google.com; s=arc-20160816; b=kMDTal8crnNjX1jpnUdZBBXnUZb4FPWb2hs/7a92JQ/g/srbSP4ZnP6vv5/V36owv2 MHRrjEgEyz/N8BvxZ3ORsiCUuBQOVo/iUB4pcuxDzxkXtGaEDuvlwaNT2vI/ccr4xs7C 61HR4nJkud7Gm2MaT1UCrozEjDrqLyn5W8Ew6xI5w0KJ5Eb5Thykc3ucOnw8pXyCaKrL 2iEO/iUhICJzcLLvZKZXzufCrfu5HLdlWxEJdSrsgaDnqFnhI9PVWLrx7gUH2T1vmMTI 1f2HdApP0uTjSKPqvSc5bWY4JP5mV0C+Qj8srPMQ/NR0QcslvIjCL9un2txqFon4fL7d aEpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=x0tjxHVjbSsTAPjXMcsYpnxOAENEKvbwiISwXLpwKN4=; b=0JCZACu095fd2wLuWxJqJprXuR+chnx5LJ0gNTYjHwzemWmZvWIBF/XDbrnYlsmB4L QgmlBosgfmmEN25jLTkHoVDQF57FIvG58v/YQdJSv6hC830OUQcVfyMkoHaEYy56UlL9 w4fs5rYHjtOLgeahaKXkumZbNkT5DIG6e6EwR5gSZazOdzKP3YTCpGXVLJCB9txfiI44 t2OzDhYHJTJvWYrH6KN3fc1VtBGWV9I8LcqM9ZikglhshukSDO7pOCs/gE8A5OuvIYTc FY5u64PpuDVelL9wvzWFedbPsyOihTfuzaJODOjUTO1OSp+8HqLi34koM0mzGGkNM54q lNoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eRPBgHjC; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id z13-v6si2778158qto.105.2018.07.18.03.05.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:05:45 -0700 (PDT) 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 header.s=google header.b=eRPBgHjC; 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]:35663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjL7-00039r-FD for patch@linaro.org; Wed, 18 Jul 2018 06:05:45 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKa-00038Q-Kg for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKZ-00014o-Bo for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:12 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:32925) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKZ-00012y-5L for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:11 -0400 Received: by mail-wr1-x441.google.com with SMTP id g6-v6so4059160wrp.0 for ; Wed, 18 Jul 2018 03:05:11 -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=x0tjxHVjbSsTAPjXMcsYpnxOAENEKvbwiISwXLpwKN4=; b=eRPBgHjCg3LxhFdh7yV/l53UwA+19yBy+5HBW11bV46drSdWZ3hPEP++SssOQFFW+m Ar80w3KXV+PS8dUgd5z9kkLaA28Nkw3wM2ysyDsSBVrux3xIBlLc3dU5B4ttVZ8PluVY k+hheeu2jaOuAnkbkv6N4bF2xOBIsVdeIecmM= 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=x0tjxHVjbSsTAPjXMcsYpnxOAENEKvbwiISwXLpwKN4=; b=kAKjB813+Kx9oIkBJfMi0qxzCIEcHSYd8jn3QJSE74CnF9JsryMasMc3MLUmSFvLtW eGttJgWatSeEFXyZ3o2FXhgNeHQvmuzcKyrQLoNA/3lxpPcAZXqZ4UmRohAJIpHokcub 5BHTq1DL5rCIcT+k0+zDvwk96IfdF33GK0PKpGFFtThnmQUY5jZx0o4vzK7+a7L6ssZB 069d4Nl2LVpArARktk9Bk75sqhtw/I+B9yL9jrN13Ln6u/66CYBH05Z//HiTjFFvclpf Yp+90Kz+ZHNPnWmgzFQCrqKhcXrEQlagmcq2mXQzVlGam7qLgzL3f1o0NjNDXJg+PYkB NMeA== X-Gm-Message-State: AOUpUlGyS8dWDDsXPHSTXTtgcmL2N6lelNjdgQPIheWwJnkWVQYXSPGc Jh5cmUB3eW9R/7/FwgDj98wmKA== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr3957994wri.124.1531908310142; Wed, 18 Jul 2018 03:05:10 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h7-v6sm2252811wrq.41.2018.07.18.03.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 6C0E83E04D8; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:04:58 +0100 Message-Id: <20180718100505.7546-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH RFC 03/10] docker: add a placeholder for handling non-x86 hosts 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" We want to keep all our variations in one place. This is that place. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 22adf6ac73..7d13ddd497 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -139,6 +139,18 @@ DOCKER_USER_IMAGES += debian-powerpc-user # tests due to missing system call: 249 which causes an abort DOCKER_PARTIAL_IMAGES += debian-powerpc-user-cross +# Modifications for non-x86 hosts +# +# While docker itself is now multiarch aware and will generally do the +# right thing (assuming the source also supports multiple +# architectures) there are still variations we need to take into +# account. These are all done here. + +ifneq ($(ARCH),x86_64) + + +endif + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ From patchwork Wed Jul 18 10:04:59 2018 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: 142261 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp350113ljj; Wed, 18 Jul 2018 03:12:17 -0700 (PDT) X-Google-Smtp-Source: AAOMgpctOsOH67vtOfcGV2vcTIgDj73+pqJ0EauqVaOnt6WmX3ss7MZ4P46seykP7YEwU8lnE7fM X-Received: by 2002:a37:8786:: with SMTP id j128-v6mr4567565qkd.32.1531908737633; Wed, 18 Jul 2018 03:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908737; cv=none; d=google.com; s=arc-20160816; b=GTwL/KxUY7Hw8YQH2lKZKwjHEm2rYFjQEFRr+Zr47DQPFKn3Y4MkXugJP4aOOduL7p LFlpZ0XWTsr+ayEsh5RWKQuc325IRN390g7rqqHW96olpFl1h2Ce/4To9XvJ0wbAXPg3 G0H+nOAW9uZ+tPL5fU2mLtDz5/xZqcTs4IhE4YnPv3T1Um4pqpqo+F/SyzGWDKgRUcbm C3WJoJxeWYEGnU9C986oQjVoCZyUFHmx73VPMdGWGRtfZ7tc34dGBV+FlnF8bR10gQW/ 38qy45H/2edBXCNCDfN6cOy0YAe71TOAhIb8x5/bXMQwBFqR6ryVKECXW4IouZeNJWyq TTlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=3E74bQv8sQzr9SMYX+x3r8pwd12rYvnRVo/Ix8z9Auc=; b=ayRtYMVNnPIkuiJy29R+CQbrXzdcr0iVf/DjZHAbpbE34BhNJQLIcjwCtii/TkwikX 5MZnFdHfcHCx58gHA07rSIAhrWcGGzxLirgz9ZhlCB8mhZNCWyENT4AuprRZD9iXmbIk rmVQg77gLbvX5pYMcJWrFs9fnhb5DDIyjJa0LwJdwLnSDX6AWOv2EGfYxXD8h8b0sIUS NcMyniaT6pp4DQXKaQ5Njq9t0b6ACYJQCYAIhidCMDcOt7qgTZqUTYtcdX8ITLdT2CTp OdjYTgUP5Eu3oJaSEoAuIACtxTElrn+NPj54fwW0XrLDXjKMfWyeZAzMO3WMamsWHZ+0 nAXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="RST/0a0n"; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id f59-v6si3669509qva.48.2018.07.18.03.12.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:12:17 -0700 (PDT) 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 header.s=google header.b="RST/0a0n"; 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]:35695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjRR-0008GW-6Z for patch@linaro.org; Wed, 18 Jul 2018 06:12:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55429) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKc-0003A4-QW for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKY-00012p-Ag for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:37316) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKY-00011E-3s for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:10 -0400 Received: by mail-wr1-x442.google.com with SMTP id q10-v6so4057609wrd.4 for ; Wed, 18 Jul 2018 03:05:10 -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=3E74bQv8sQzr9SMYX+x3r8pwd12rYvnRVo/Ix8z9Auc=; b=RST/0a0nvI7a7I9rJADhwOACGacCa9vVDRQP67Qvv1qkL3YPOjPIn/cxGHcJs/q94V SVu/qxVBwWmAetxqq+5sEgjgMFLDOCCK5NS6P1g5PNhtEF5180/FLKWbQynUPT+vyma/ ZmeX3ach0Jk6lmmm18EY4oBOw4Ro92Tzln+5c= 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=3E74bQv8sQzr9SMYX+x3r8pwd12rYvnRVo/Ix8z9Auc=; b=PHA3HP6zQkp5zzR+ZkSBVbs/4+Pl71IsMmQB7/tpoKw98T+fhrJxirfRpQYE3dUzmE UMbera2EEUs0WCJABWQrpJrw+eUSjQ6h1usOZQiJUy0qRX/Se9QzBQa6ZwGE052AaDEn nxfDUxzpJ/kt0zIV7KFvPC7+A6Tvq9J2JIUDLtYuxAf7DoXjtVaMf11tX+tfu205KUhw tuGFj1q4P52L7u6v/3onzhL9tbYhkJlEhCPvTNkYjOQkafvcsSfY1wfz2p99f1k1bUEF 94UuJfLwHKXP3tRxRyN2PCd3TDiRB9GcV2gizezkBUNMr1COKcgVGJDb49GwmARl5QbW wPJw== X-Gm-Message-State: AOUpUlG5xt4fBISxl9funTuVgcpu5G5mP2EKt4dq0TUsGQq0QFY3Wxh9 c2BhcY0jDxkBSLcc8yMb8oWpCg== X-Received: by 2002:adf:eb4c:: with SMTP id u12-v6mr1310133wrn.174.1531908309143; Wed, 18 Jul 2018 03:05:09 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q1-v6sm4108247wrw.42.2018.07.18.03.05.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7F5603E0520; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:04:59 +0100 Message-Id: <20180718100505.7546-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH RFC 04/10] docker: don't include docker-arm64-cross on aarch64 hosts 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" Attempting to install the native compiler as a cross compiler rarely goes well. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 4 ++++ 1 file changed, 4 insertions(+) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7d13ddd497..2cb180ff6c 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,6 +148,10 @@ DOCKER_PARTIAL_IMAGES += debian-powerpc-user-cross ifneq ($(ARCH),x86_64) +ifeq ($(ARCH),aarch64) +# no point having a cross compiler when it is the native one +DOCKER_PARTIAL_IMAGES += debian-arm64-cross +endif endif From patchwork Wed Jul 18 10:05:00 2018 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: 142259 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp348636ljj; Wed, 18 Jul 2018 03:10:35 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdH5DRAqldLzDLaw+ecC7YsYg+JLD/FPWpeyQfvece9JDEN0mA4jt/ya2EsVkhsysfNzrni X-Received: by 2002:a37:849:: with SMTP id 70-v6mr4723442qki.200.1531908635579; Wed, 18 Jul 2018 03:10:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908635; cv=none; d=google.com; s=arc-20160816; b=l1B8XQh2a+xm9+GBWSN1NDvDv/AO0nkWnfUuXQmE6pL8ULcPNUymjbSpENoeYr28V2 OOoTNLQQpJTyDVOTmwGwWZM/sUqnKmHzS7nlmVnlYxPxTrCro5aGQn61w081gqD/Emf+ Dx68s0H/zIGmTWWOqAkj1agmM7pjc6Xg+kzpbzeRea+/swCFP5qF1e7KCEsrpNIJn8CA W+DVArqqtuFxTcG3o1n/QJ8CH/DIXGt7MEpBr/3bI2PcgH8MJ5an2lt/PwpE/UUdmYaP T8ddS+2p0CzL0msiFeaLYGP+3ue+Ev5VEB2VR38e0FLQyaH/EoRXMeMmrcoy0mWlNd9v aNbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=qhPgDnIYcxk4T+uhsryqwlc0DylviykJqfRTJ0U/UTFpNwUuOrhZHjgxt5u0VdcbEa ailn3p+wPGf8nBLkHsjzB2KB3BhoTEE7nwoehDhs+3IMqa4oilDGxdlZ6H68PgR5hWD9 vWcLv4sfu0jKkBauelcJmY77IAvkP8+yAc+k37RDzLPKo0OgTC35CB7K0cvU8NdKr+21 8OjqGSaalSUgsLLrxJL8s6CK5wEPi/fe3q9DU8hP3sFuE4BBHxruUJr5lHSWEiCp1Wn1 X/eOCcq5D32L9SNGzzNwceesLsQcXARj00ibRIdX543Baw080GVq04Zr3YvrJvIoBMJb 9nzQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=QX8Obcwy; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o63-v6si395984qkh.329.2018.07.18.03.10.35 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:10:35 -0700 (PDT) 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 header.s=google header.b=QX8Obcwy; 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]:35682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjPn-0006Ya-3X for patch@linaro.org; Wed, 18 Jul 2018 06:10:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKg-0003Hl-Lo for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKb-000179-D8 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:18 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:44514) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKb-00016T-72 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:13 -0400 Received: by mail-wr1-x429.google.com with SMTP id r16-v6so4039019wrt.11 for ; Wed, 18 Jul 2018 03:05:13 -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=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=QX8Obcwy3JUbx/mhE0kPKc5N595iV9kw+IXzaIJmYWQVG6qeDGO9/SvSSp5IA5UFnR BlJt+Ps3qaRYZCCys9YIohV/wo4ZtuX6jafRILz63tbydAR8+FUDWr3+7UMkYwn8RBl5 oMRRMJQaATyoW/soM2No6k9gdceBmeQhm8KBs= 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=R7WJlgOC/Eb7eHKtYMd9nlXsHtszE6zXBbaOOm4XzFw=; b=B+5mGI8UD5R5kmPzNhD0QndeH4EsMLsvnXt1iUbwJu3cujxxEvBlIcMXuIIjmI1UXY zKusmLqAKjkPMoROJ1kCQTTm3dotIMgZhfSstSdLoV3/ek9vp1uh/Em192xKSvfUdjhO J4kRQqk9Jzi1yQ5jO2E8lGHXNVo8wPMl0tqtngiBgdX7XQnh/vXLI/HVzTx2ZOV/r1ak QDYpTvb4FU7sTIzQebJTWX1vckB8tkj44/ANjEYXpCMkQanp7QzoW4V6ZJ4OshZuESRW /5GQWSnI90A9019RimkGfJuHPh9GDifwhrgFg170f15k4nu1+iRWTJlpwpMqut0F6XyT h89Q== X-Gm-Message-State: AOUpUlGpUDAdbSd+Wkuda5JApPJFYUiMxdus1ju0IELangzJaZmvlN1A pBjn09zVyryv7pRx5/XpxNbndw== X-Received: by 2002:adf:b2f4:: with SMTP id g107-v6mr4069541wrd.53.1531908312169; Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v15-v6sm1860868wmc.16.2018.07.18.03.05.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 936153E053E; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:00 +0100 Message-Id: <20180718100505.7546-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::429 Subject: [Qemu-devel] [PATCH RFC 05/10] docker: fall-back to binfmt_misc debian-mips64el-user-cross on non-x86 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" The Debian archives don't package their large array of cross compilers for all host architectures. For MIPS let's fall back to a linux-user based image when we can't use the native ones. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 11 +++++++++++ .../debian-mips64el-user-cross.docker | 16 ++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-mips64el-user-cross.docker -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 2cb180ff6c..5cfb1a57bb 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -153,8 +153,19 @@ ifeq ($(ARCH),aarch64) DOCKER_PARTIAL_IMAGES += debian-arm64-cross endif +# No MIPS cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-mips64el-user: DEB_ARCH = mips64el +docker-binfmt-image-debian-mips64el-user: DEB_TYPE = stretch +docker-binfmt-image-debian-mips64el-user: EXECUTABLE = ${BUILD_DIR}/mips64el-linux-user/qemu-mips64el +docker-image-debian-mips64el-user-cross: docker-binfmt-image-debian-mips64el-user +DOCKER_USER_IMAGES += debian-mips64el-user-cross +DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross + +else +DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross endif + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKER_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-mips64el-user-cross.docker b/tests/docker/dockerfiles/debian-mips64el-user-cross.docker new file mode 100644 index 0000000000..98284bc635 --- /dev/null +++ b/tests/docker/dockerfiles/debian-mips64el-user-cross.docker @@ -0,0 +1,16 @@ +# +# Docker mips64el user cross-compiler target +# +# This is a binfmt image for when the MIPS cross compilers are not +# available in the host architecture archives. This image is based of +# the debootstrapped qemu:debian-mips64el-user but doesn't need any +# extra magic once it is setup. +# + +FROM qemu:debian-mips64el-user + +MAINTAINER Alex Bennee + +RUN echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu From patchwork Wed Jul 18 10:05:01 2018 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: 142257 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346901ljj; Wed, 18 Jul 2018 03:08:41 -0700 (PDT) X-Google-Smtp-Source: AAOMgpccF+e2YS+N41fR8KksnMNE5cDLlu4s1dM4VQ2Y7eMyExXC+ISuDJxWIIgJet2RwzHjFX0l X-Received: by 2002:a0c:92e4:: with SMTP id c33-v6mr5602324qvc.178.1531908521299; Wed, 18 Jul 2018 03:08:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908521; cv=none; d=google.com; s=arc-20160816; b=lZBXIBHjIeSCktBzF062hJ6/B62jJqulCdVdNxpdCnxZ0HktxoW4AA9Fv4wVriqS2V 6CixvOfjRin8sc963iL45YSFdtDSYsUU24UGhk+n1ErhSVOr03hbWrHLCb5BduvTyCwj eiVAnoFfICK2whGPjYuqKKAYpBsdSO/2YUC+UilzD+aGVwyBgqjiZ7DTJIcs55c/iskg 2+7KrVmqTlQS/6L6v54Fad+LELr2UtcxLbUYPYXWFuy1mMTDZZuBTZa+FKQRIvvbRrAA jAHZSAm8LKj/Y43WU0OFkz422zIcpZWcsXc7oYkg7aHnJ+0ruPLCZE1Fdwxt6Wh9fX8V QSUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=wB5QLvKgza/3ik6x0KL+ybnuoOZ3Eql2kkihjb4u7aQ=; b=hNs7l3TSMczA9qwOrgN04RwRxTx7qUB1aFR7khJ+z8meDekwdSuRSpZhl7xBKwG5WP zzJke18W37o13bmfWfK5NJ0lmqeQ0jrIDqoJvFeP322OIl4gzZZnv+tmzjbVhBSoIRQ2 Ift5rJSg5ALpuYLhvMNa9cnKHEcJCnZ1wgFwuv/QwQCAbaupcBWqXg/SKy9x5IsNAjtO zfn43kj8MWCjg5bOHfdI4OHVjcFRkpwNZxbGvOEE5Jpk+DhYeMZns4b5laNbOLKJ+ht7 oL94XCHCiBhZufo1jE9U6DLZjAA0m75WhJ2zhk3E1quRxMaXn7O3oD1Zbm1NW6XxxOId FDvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=UGAHXNf6; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x67-v6si2959311qkc.134.2018.07.18.03.08.41 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:41 -0700 (PDT) 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 header.s=google header.b=UGAHXNf6; 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]:35673 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNw-0005Uf-Q1 for patch@linaro.org; Wed, 18 Jul 2018 06:08:40 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55419) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKc-000395-3n for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKa-00016K-Cs for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKa-00014y-4h for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:12 -0400 Received: by mail-wr1-x434.google.com with SMTP id t6-v6so4045672wrn.7 for ; Wed, 18 Jul 2018 03:05:12 -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=wB5QLvKgza/3ik6x0KL+ybnuoOZ3Eql2kkihjb4u7aQ=; b=UGAHXNf6AihSz7fFco7L8HWzfBPAKHHjnJ7C/O18V5H6+WetJxXvbYSGAZh8inRRmJ 3q5E1V/9hs4txfsYs1CgXUiIOTPpNmanIrD2zToCZUGVkQ9BnVZQK2CMASTEY4Q4yMo0 xnUi6QMQEMfTGMhfcpPbZ4ZO4IunA0bOXFXmU= 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=wB5QLvKgza/3ik6x0KL+ybnuoOZ3Eql2kkihjb4u7aQ=; b=gsE3pviB5Lk2wILz22LxccbPO5Rwf0zKGf7Wq1b6FFRHci43dNe+VizG4JPBSJ25Ly FvY0VAZn1uyqtjE38bVzKgZVxuXOs2tIwHPSYyVfCUCNgjAozlMpVPW9eEgbefWuqolT GlqrSsXUBUJIkLVwZbaT+iXeWqovzS+RGtk8Tt0q7oAUXZGMQOPj7nUaYr5kMirV+rLj ur/WmsbbcLVZUL6zgCDmjgG39arPck8XQqIiPHAf1uyO7RN4UGkwGt2FomSR7tNIhfC/ oESf0HjVggA9JDUaderq5aqQ4vxEu8dYQga8WX0KUsY3TPl90INEHO29cGdsKsRL/MT8 5Izw== X-Gm-Message-State: AOUpUlERkuscKHEgOoaW88BJDqJc8foilECWRrblz0qdiivRkgWp8hA+ zVkRYf/DLTfVzWW3t3OGIuHgfw== X-Received: by 2002:a5d:4701:: with SMTP id y1-v6mr3944528wrq.107.1531908311133; Wed, 18 Jul 2018 03:05:11 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w9-v6sm8904399wrk.28.2018.07.18.03.05.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:07 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A6CC93E055C; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:01 +0100 Message-Id: <20180718100505.7546-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::434 Subject: [Qemu-devel] [PATCH RFC 06/10] docker: fall-back to binfmt_misc debian-ppc64el-user-cross on non-x86 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" The Debian archives don't package their large array of cross compilers for all host architectures. For ppc64el let's fall back to a linux-user based image when we can't use the native ones. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 10 +++++++++- .../dockerfiles/debian-ppc64el-user-cross.docker | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tests/docker/dockerfiles/debian-ppc64el-user-cross.docker -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 5cfb1a57bb..879bacde93 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -161,8 +161,16 @@ docker-image-debian-mips64el-user-cross: docker-binfmt-image-debian-mips64el-use DOCKER_USER_IMAGES += debian-mips64el-user-cross DOCKER_PARTIAL_IMAGES += debian-mips-cross debian-mipsel-cross debian-mips64el-cross +# No ppc64el cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-ppc64el-user: DEB_ARCH = ppc64el +docker-binfmt-image-debian-ppc64el-user: DEB_TYPE = stretch +docker-binfmt-image-debian-ppc64el-user: EXECUTABLE = ${BUILD_DIR}/ppc64le-linux-user/qemu-ppc64le +docker-image-debian-ppc64el-user-cross: docker-binfmt-image-debian-ppc64el-user +DOCKER_USER_IMAGES += debian-ppc64el-user-cross +DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross + else -DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross +DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross debian-ppc64el-user-cross endif diff --git a/tests/docker/dockerfiles/debian-ppc64el-user-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-user-cross.docker new file mode 100644 index 0000000000..aeb207e9c2 --- /dev/null +++ b/tests/docker/dockerfiles/debian-ppc64el-user-cross.docker @@ -0,0 +1,16 @@ +# +# Docker ppc64el user cross-compiler target +# +# This is a binfmt image for when the ppc64el cross compilers are not +# available in the host architecture archives. This image is based of +# the debootstrapped qemu:debian-ppc64el-user but doesn't need any +# extra magic once it is setup. +# + +FROM qemu:debian-ppc64el-user + +MAINTAINER Alex Bennee + +RUN echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu From patchwork Wed Jul 18 10:05:02 2018 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: 142256 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp346665ljj; Wed, 18 Jul 2018 03:08:22 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfh/IxpCLvLOYia9FhaW8lkqO1MaXqCQr2FBqgUaM4jOr5kt9mwCCU/ym4/dYZbGXuJGP05 X-Received: by 2002:a37:151f:: with SMTP id f31-v6mr4589820qkh.388.1531908502650; Wed, 18 Jul 2018 03:08:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908502; cv=none; d=google.com; s=arc-20160816; b=IjuQ1RU/BAo304+plZqquOt3eBJV4dcN230/cVuq5zhyLb0U/jIiLWQ3pmZ5nceBgD 9DS888QT9S0hwSTdt2xYBb+HEmOYRmw6R8t1yqbNWCAsv+Fujd5y8Xwojaf6WZ0wVKiS n4YRdk3ZwVYm/TaDHc7TBdDd5thEZBB/WQgy/vI8y/p0T0iECoIGHfzrVR4tVK9JkaSM AsZFgjxKRMBhOwmd+VMHhA8iHS4u++uv2mMYzOjh5VYlwqeUcAcaTPdhXq9LTTWGdrU6 cXzuha+RyQerE29ffH+i+xl0u/b6VXNImIl9Y0Ud3BMGUa0oTlLnO18foGKL6aJ64ql5 dvCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=AOTuEUUS4Hm/zr/MDuRDVFbZ3zweTr/X84eofdPvFZSKNRFeBawc6tMSlzSzY60u0/ KLGQ0dpWwBoIkWOahvk/kSS+ELd7qMCljkALrj74q+tbvzLNOR/ho3R6/g6B14N8XfrS Ia6urE4x68d2W3WJz0U1ntU51S3xa2smkVV1GYVRykO3gqhCrU+o/+Md08ziUF46mPT/ /YhtaCf5k+OwanQ/JLpzVuFxK2WrGeeEjKrmtJmXwnlIrnVq2ekC+sCXA/W7//EBgAn/ J7JzA5ivEHQUQ8iuA5c62op7lmtJa+yC9xzXF/PxFgdVdgDY7LdvwCpV4tbg730lfpAD 1G0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=As4BjlZr; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id k45-v6si3184426qta.55.2018.07.18.03.08.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:08:22 -0700 (PDT) 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 header.s=google header.b=As4BjlZr; 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]:35671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjNe-0004Rx-3y for patch@linaro.org; Wed, 18 Jul 2018 06:08:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55454) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKe-0003D6-BY for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKd-00018S-0G for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:16 -0400 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:42971) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKc-00017V-Nw for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:14 -0400 Received: by mail-wr1-x42d.google.com with SMTP id e7-v6so4043728wrs.9 for ; Wed, 18 Jul 2018 03:05:14 -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=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=As4BjlZrOfA0gRE0F/6rFJN3xBahi2fHPU+/ipMczriLrF3lMVoy1aaUXchq5OLtLE 9BbRC54/eDnZlsCRpEFzlzRT+6Dqq+YqvBXzLLMeCZaBfocAcYABOFbNzEtvJ/i5n1CI ibhZIkFL87t3PPR5hV3G5BlCGvGSEAoH6W7k0= 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=Qlo8pS+YMAruoQXF5J0rsqM9Ef58K4gYmOMlEODNVyQ=; b=c8H82PXz/PsyQ5lmXUk0gVmqEPalzVsv/OBSmGm9/J/bDF14Yd7B5omVqiuHe5/no/ MMYvAlaQD9KyLGFp37LpMz7/Bm7Smsi80karcWy3sxaKeG5hs5PP06Jp0bt4IAG5Yx9e /Urqi+DzSqRDDYGLDTct6g7HAUD8BldEzFEi5F6NxUGGcVD4o9ljyCf6howxNKGpOVEC Jm9O8hG/3IJ2Vx8YLdCPN4UVJ1wUEuYRnCLoppOw14wu1E/2UoACxOdTJM/MFU1Ee/kj /lGC0JPXZNsAMUfYbQdp9EAcC2ppDVe7vSP+x0MpQ80Jgw6IxmF8CCWRCAnSTupuarbC q2PQ== X-Gm-Message-State: AOUpUlH8pjTyUd9DDIp+2ytkwGPAjuLFV4QiFHV13sjmwkKQj7QwEarw N1cAhjmUHzXKQ7U68MnNw8N8wg== X-Received: by 2002:adf:d08c:: with SMTP id y12-v6mr4070262wrh.152.1531908313647; Wed, 18 Jul 2018 03:05:13 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b11-v6sm4106107wrv.82.2018.07.18.03.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id BA5933E056A; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:02 +0100 Message-Id: <20180718100505.7546-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42d Subject: [Qemu-devel] [PATCH RFC 07/10] docker: fall-back to binfmt_misc debian-s390x-user-cross on non-x86 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" The Debian archives don't package their large array of cross compilers for all host architectures. For s390x let's fall back to a linux-user based image when we can't use the native ones. Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 9 ++++++++- .../dockerfiles/debian-s390x-user-cross.docker | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 tests/docker/dockerfiles/debian-s390x-user-cross.docker -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 879bacde93..e1eba21f06 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -169,8 +169,15 @@ docker-image-debian-ppc64el-user-cross: docker-binfmt-image-debian-ppc64el-user DOCKER_USER_IMAGES += debian-ppc64el-user-cross DOCKER_PARTIAL_IMAGES += debian-ppc64el-cross +# No s390x cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-s390x-user: DEB_ARCH = s390x +docker-binfmt-image-debian-s390x-user: DEB_TYPE = stretch +docker-binfmt-image-debian-s390x-user: EXECUTABLE = ${BUILD_DIR}/s390x-linux-user/qemu-s390x +docker-image-debian-s390x-user-cross: docker-binfmt-image-debian-s390x-user +DOCKER_USER_IMAGES += debian-s390x-user-cross +DOCKER_PARTIAL_IMAGES += debian-s390x-cross else -DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross debian-ppc64el-user-cross +DOCKER_PARTIAL_IMAGES += debian-mips64el-user-cross debian-ppc64el-user-cross debian-s390x-user-cross endif diff --git a/tests/docker/dockerfiles/debian-s390x-user-cross.docker b/tests/docker/dockerfiles/debian-s390x-user-cross.docker new file mode 100644 index 0000000000..396763f10e --- /dev/null +++ b/tests/docker/dockerfiles/debian-s390x-user-cross.docker @@ -0,0 +1,16 @@ +# +# Docker s390x user cross-compiler target +# +# This is a binfmt image for when the s390x cross compilers are not +# available in the host architecture archives. This image is based of +# the debootstrapped qemu:debian-s390x-user but doesn't need any +# extra magic once it is setup. +# + +FROM qemu:debian-s390x-user + +MAINTAINER Alex Bennee + +RUN echo man-db man-db/auto-update boolean false | debconf-set-selections +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt-get build-dep -yy qemu From patchwork Wed Jul 18 10:05:03 2018 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: 142262 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp350386ljj; Wed, 18 Jul 2018 03:12:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfLyKSdP7LX+QgFNdsrCseRXOMwT7tCf5qrhV6rncuAncxX5N9CiuQUbKC9jrUXs1hjbiHd X-Received: by 2002:aed:38a9:: with SMTP id k38-v6mr4692493qte.170.1531908756188; Wed, 18 Jul 2018 03:12:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908756; cv=none; d=google.com; s=arc-20160816; b=mBoIlb9x1x6m8oblMZq57MQaDT01bSi6mR1GUvyLSsm+ob70BSWyJrVapZK/NfytTc 7XhpDyWpwajl4TAXbMuriocMCPCQLRZkF9yA3TPnsXEYjvHVx57Sb5rUyj0+52NjzZKt dSF7P8kijwS/6t6mQkmgrxJCy6o17veTnHPKzi4K+cTQFBX2udIrN0JqC36f20Kj8DVX c1SE/r8ZT1QB/RrxXEBMfhfUMDZ2iWvGF9OW6wVwmB0waHIoEmoIe7BTs4jEp15/t5By k0ZfusuzLk1xupKtEq3Q2xYFiUvxaGPUZQvMc2Hmvz9DO4EkjjGmbiguAirqd4Cpd8gu O8kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=YfD5y9TaE8/TPijGiK4qGDR4bGV4Fov/WvSnLK3CdaY=; b=jSVSUxOilOvHtpwz2mXHsB5VI2HC3nKSrdwAGF5so7gTzAKRBY37/dcaWRKI81WO9U 4RbRYzMEN3ORHWmxG057eq9fRpn3um2evCs3gcgDMjzEPmMOlc5Ftqs9cB/wQdRBSodw JT/u/gIDWV8KBAi79sRNI0HCT1Ty1He00sv2pTCs5czNqPRt97RZ/92Cr1pjXpXCxtaD mFDG7NsRDVYLvaHyb0Xsk2rYFNlvuASkGpr1Xe6Xq/ImvOsaFTsRPc3OLWBTpjWCcplM /ch4XE673VMI6UsNBEgg3N14Jwbw5Pn2H/Onmh8nj2V/JUTIhzL6nyxlhOJtrGFf1ovR TFCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ZjPE1GV4; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a50-v6si3068771qte.171.2018.07.18.03.12.36 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:12:36 -0700 (PDT) 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 header.s=google header.b=ZjPE1GV4; 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]:35700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjRj-0000SR-O6 for patch@linaro.org; Wed, 18 Jul 2018 06:12:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55486) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKi-0003Jt-GA for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKd-00018j-OE for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:20 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]:34532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKd-00018G-Dv for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:15 -0400 Received: by mail-wr1-x436.google.com with SMTP id c13-v6so4062785wrt.1 for ; Wed, 18 Jul 2018 03:05:15 -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=YfD5y9TaE8/TPijGiK4qGDR4bGV4Fov/WvSnLK3CdaY=; b=ZjPE1GV42eFnJWFSpXIVnve7GMWuximRyLBKMgucEYdNHEBDsbSq/QW5Cixt1mUD74 nABx9ZW2gaYQjMpUV2YM+BtWj+URT8RgtaJ5jR7ViGYpmqWB4bwz5DNj9TgXIWJ4L2ZV bYPdxWcuK8zjt1jvLVZkCVg/ZoiCSEMXtMfXc= 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=YfD5y9TaE8/TPijGiK4qGDR4bGV4Fov/WvSnLK3CdaY=; b=U6XoSwp8ZbuF/DMiR/j+M3/AnIkcMlqg7oEM3ccFoVAwP69Pqms+40wtOLVrsyBHqa zztnJ3wtYvQFghipRmoZXY37+xChtWsiDCrqdgW+4fk7zZw5zNyfcidQU9ZB7y+w0Tti Q+61viFO84BjjIlwCuum99elNmFo+GYCvUcIR+tRNr6wdm5Racb03EP4G4ivkQWIvt4h mz7An4arUsBA21bVFdWsTepvG86REs+8fyWvZzDLeQaH3rJJHr25FuCcZemOetCnhs7T XFB3/4mMn5qOzr3FHvfvoUqf88iK79RrzUAokrP8GqBCcV+CHSDtcIkMbrsbkLi+7I1C WhQQ== X-Gm-Message-State: AOUpUlE4wSgRBPaKcDdlQNoVdtcUO7iFQs3IiDDK0qkBlthEKs68CiSI JdM7hxXnuW0cIoyEmfivCx4Mhg== X-Received: by 2002:adf:e90c:: with SMTP id f12-v6mr3968377wrm.126.1531908314405; Wed, 18 Jul 2018 03:05:14 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a14-v6sm1421265wmb.44.2018.07.18.03.05.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CCDE63E0577; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:03 +0100 Message-Id: <20180718100505.7546-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::436 Subject: [Qemu-devel] [PATCH RFC 08/10] docker: disable additional non-x86 images 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" - travis - doesn't support non-x8 - centos7 - only AltArch, next release should have support - debian-8 based - docker hub issue? - ubuntu - image a bit old, maybe update to 18.04 Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index e1eba21f06..2226abd092 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -148,9 +148,16 @@ DOCKER_PARTIAL_IMAGES += debian-powerpc-user-cross ifneq ($(ARCH),x86_64) +# Don't include non-multiarch images +DOCKER_PARTIAL_IMAGES += travis centos7 + ifeq ($(ARCH),aarch64) # no point having a cross compiler when it is the native one DOCKER_PARTIAL_IMAGES += debian-arm64-cross +# hub.docker.com's older Debian images are not multiarch +DOCKER_PARTIAL_IMAGES += debian-win32-cross debian-win64-cross +# older Ubuntu's need fixing up as well +DOCKER_PARTIAL_IMAGES += ubuntu endif # No MIPS cross-compilers in non-x86 Debian images, so use linux-user From patchwork Wed Jul 18 10:05:04 2018 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: 142260 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp348843ljj; Wed, 18 Jul 2018 03:10:51 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe5nS0Ogg369PsLMt6BBqnLDpt5Ofnab+mjFnLUgA7VI4nJwYsbfhkRy4Ql7n58uaX1l9/6 X-Received: by 2002:ac8:2c72:: with SMTP id e47-v6mr5138919qta.60.1531908651317; Wed, 18 Jul 2018 03:10:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908651; cv=none; d=google.com; s=arc-20160816; b=riOoXwucYfPpgwkq6jTAyBJxrEBc507qWIea2svpnNpcV0ARkODpfrQZGbtxrGBQeu sSUk1xtNQ3WaK0ZL/3N0DGSs2x73gAAfsHbsB3Qdc/z9cgH3fDdaso+fBiK2Act1hAmS vA2dtnPEiI1vzPL1D+LgOVAfGoMGClsijtj66EwDB5dtuUCU0a30AkOSUhGu1ZxkOMRV 533DkK38Hp9tYhTpjZNQEfz6ynkt7xfMv+Q6YGm1MD0IQtGwLy+DC/P0piHPWuhK7sqL j1mkGzf8ikebKBlfYXkxGdAyGvAUXQePSesR797tJkQtRMr6jMxpPyu1rMNUSFU2i1RO 2tVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=nOM+5uRfgIYM1/+QkjXrg3WAfZqGvegSYCJ99eKFKL/n+ts8ckRqaRE93h407P+SOB ITXQd3Ai4EINJsjICyiFl3xiyboFC7EiNcrOtUyx9k+KmJpOXCFjzR3VloZDdWD2Ucrt QlZCEzIlw9GrPeYKxk5WmzYfogzLhJakOC+U77+3c/bMlcU5xeMKuaDpvRyof3juA3qv fMx5mzcnTAv60vUIBarJmiOUsoj9lf4Xsk5bTVaQ8PP/i7iIERDHcNF4dGSUAlKqkmdo HNdv+XI9OKelV/goZ7waXdtwDWn8Tm6uTuXOYF0ONKH2Wpasb3a1OVNJXpl2HrZtLOnT HtMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JxPMvsO7; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 61-v6si843716qtf.322.2018.07.18.03.10.51 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:10:51 -0700 (PDT) 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 header.s=google header.b=JxPMvsO7; 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]:35691 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjQ2-0007bk-Qs for patch@linaro.org; Wed, 18 Jul 2018 06:10:50 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55487) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKi-0003Ju-GG for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKf-00019U-3R for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:20 -0400 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]:50752) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKe-00018r-GO for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:16 -0400 Received: by mail-wm0-x229.google.com with SMTP id v25-v6so2202856wmc.0 for ; Wed, 18 Jul 2018 03:05:16 -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=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=JxPMvsO71rOJkSCUojuwTR6+MTTrLKfHPq1ILAwn8GaFfIjU1ewNCj1cqFkIEmJxdA h5ndnh8ri3JDNioN7Rh2xiiz6jDf+am1Eo/5I424ttBdhMte+nZqz3pMdcwDoq36MO7d ccul81OVQHdu0GgCguS8fAGh5MNbUmLAgSn4M= 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=UEhcc8qtR2jdUBgfDDH7ez83SUKwd1NGXpwmEUCgQoE=; b=acrqF+VnlxaD7oorbFwF1Mg/VsJVajZmz0rII/ApvZeHNGjvxuKw4C4g8KrNuENygm OzgNMeCyHmDA4sNAcMoxrdArFujZcJu+KCksBgwuEN5H7BpRK+YvjYF4pyDmlSm2s5av +hpB0EL0TT/si3sYJ9PfTQ6FuoH2YoYz+Fe/snaNFl7y3qR/+H6XjmygZHWHfa1bgKUO qHKEk+AN9ByWdE9fDFbQYnFn9+QMrvHyN5XXOYUtNWq2kbO+XRqnxSLhgYMAm6uMG1Ty j61I5EqAnDiRtoeXcPCpUGLU0m+zoUN+TCYn4TSmVyasYVWuyu8v1PY/txpQDChxwjkp f4gg== X-Gm-Message-State: AOUpUlHk2G/t0EUJxxKf/tZQcIqcnptQ1fkjfDoVaL1shubVJe15GMBC ZX10AHxy4bWCYKlpT30tx4gw0g== X-Received: by 2002:a1c:9e4d:: with SMTP id h74-v6mr1242500wme.70.1531908315374; Wed, 18 Jul 2018 03:05:15 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s9-v6sm1394301wmc.34.2018.07.18.03.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E158D3E060C; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:04 +0100 Message-Id: <20180718100505.7546-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::229 Subject: [Qemu-devel] [PATCH RFC 09/10] tests: tcg skip docker images we can't build 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" We have a mechansim (DOCKER_PARTIAL_IMAGES) for marking stuff that is incomplete or won't build. We can use this to avoid attempting to build them at the top of a check-tcg build. We need to move the inclusion of docker/Makefile.include to ensure everything is resolved by this point. We also have to check this in tests/tcg/Makefile.include to cover the case where users are building directly out of the target tree. Signed-off-by: Alex Bennée --- Makefile | 4 +++- tests/tcg/Makefile.include | 3 +++ tests/tcg/Makefile.probe | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/Makefile b/Makefile index 2da686be33..6bb8035557 100644 --- a/Makefile +++ b/Makefile @@ -434,6 +434,9 @@ dummy := $(call unnest-vars,, \ audio-obj-m \ trace-obj-y) +# we need to know what Docker images can be built before we can +# decide on all the tests that can be built. +include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/Makefile.include all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules @@ -1069,7 +1072,6 @@ endif # Dependencies in Makefile.objs files come from our recursive subdir rules -include $(wildcard *.d tests/*.d) -include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include .PHONY: help diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index 57470b2a2c..e5f0298375 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -41,6 +41,8 @@ ifneq ($(DOCKER_IMAGE),) # We also need the Docker make rules to depend on include $(SRC_PATH)/tests/docker/Makefile.include +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) + DOCKER_COMPILE_CMD="$(DOCKER_SCRIPT) cc --user $(shell id -u) \ --cc $(DOCKER_CROSS_COMPILER) \ -i qemu:$(DOCKER_IMAGE) \ @@ -58,6 +60,7 @@ docker-build-guest-tests: $(DOCKER_PREREQ) GUEST_BUILD=docker-build-guest-tests +endif endif endif diff --git a/tests/tcg/Makefile.probe b/tests/tcg/Makefile.probe index 15c0412657..22c77d6b88 100644 --- a/tests/tcg/Makefile.probe +++ b/tests/tcg/Makefile.probe @@ -20,7 +20,7 @@ DOCKER_PREREQ:= -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include ifndef CROSS_CC_GUEST -ifneq ($(DOCKER_IMAGE),) +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) DOCKER_PREREQ:=docker-image-$(DOCKER_IMAGE) endif endif From patchwork Wed Jul 18 10:05:05 2018 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: 142263 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp351620ljj; Wed, 18 Jul 2018 03:14:01 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcsK37JohQGj8O3rnicp/Tb58y55dja4hF9Ks5PxzllRyRM1dt26KWZfDgzUIqfL/dCbh1m X-Received: by 2002:ac8:376a:: with SMTP id p39-v6mr5187886qtb.257.1531908841699; Wed, 18 Jul 2018 03:14:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531908841; cv=none; d=google.com; s=arc-20160816; b=Wiqv2Dj7HfXo2Qk/FphdgiQpvqt0KUm12T1GWT2o+PkfzLVZKW+lyGoWUsBUtfZYxe uI4bm+AAI0G0SoTSzj5NpPBJMEFJAyK7NWDRPjw5hah8RRlSvsRYy1dZwLNnOHT8amhG dUx4N+nWS8g0cZvH8VMDb7CDh3jkMCFRlt4pmPiY/8TLremBXF1+TW4QJfHVIbbngOiF GIfg8Qba3aICfh+8bF0D9JdR/hS1lrMNTuDxTk8DxaKQovMeKKKokDw9JFw7T7L9Y88k +AXWCj6FLWVAPF6ePhEvBwDB2agw22z3StPDcYXOxKOlSL++4LI7omovHz5XL4v+D5WY PNSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=XR3QgwXcBNTIJ6mNeG3Wp2zj3+1gckNSFC7KpbQJfNM=; b=DuFO2C+l4qGByLdaS4DHgcPVqAPHah7W+GVz2a4vHu1xOVeyK0qi1h50Ipy/Ytsyia 5aQ3YAxOkd25C3YU6ORw+pfY8ebkIoba2No+2atx0+ddHuJG6iGV/n652oFS2a6QsqR4 SUl01K+JabhZ7jmw0omkp0SCgGDiEOxE/87/czldFHXz5dNSPZPljgc0g5VMGhgQAB8t /VwkKNERt5ecgdVrQOm5N+hKmXSrlTcIxt9CkZlUL5Bp59nmI91uPfW9X0wQupgTnHJb BlOMsBLSrQuuHThtBdHOm6PI2LbuVy3XoQ8QUxCjRBy23/Z6lE0xnvn2V3ZEWoFa5ZqC NfAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EOhDupNO; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q28-v6si3160618qkq.59.2018.07.18.03.14.01 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 18 Jul 2018 03:14:01 -0700 (PDT) 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 header.s=google header.b=EOhDupNO; 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]:35703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjT7-0001K6-7z for patch@linaro.org; Wed, 18 Jul 2018 06:14:01 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjKi-0003Js-FM for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ffjKf-0001A7-SM for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:20 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39462) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ffjKf-00019D-C2 for qemu-devel@nongnu.org; Wed, 18 Jul 2018 06:05:17 -0400 Received: by mail-wr1-x442.google.com with SMTP id h10-v6so4044365wre.6 for ; Wed, 18 Jul 2018 03:05:17 -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=XR3QgwXcBNTIJ6mNeG3Wp2zj3+1gckNSFC7KpbQJfNM=; b=EOhDupNOOVt9Zw/hUSdDyzly4i5r4y65SPmfwDwsQYbm6bRMvC1nY6celmbnOJlqzU SIO+LBiUeSn/mSYty6ZI+2ug0qiodwEIGKR2bgNnv2pIFyLY3Iq7QUTgaMGS/Tsxmhra tOxwcBocQilIS0jALU7/Ap53sSXrjykhTHLaI= 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=XR3QgwXcBNTIJ6mNeG3Wp2zj3+1gckNSFC7KpbQJfNM=; b=XhC9hD5YYJgeqfM0nN9/6fS3GaMF0hgBYEInkYjW+xhuuC84yX+VXPGyy5Sfc32kT+ PKKf2V9jkJBQm5cx/nA2jOR4PgVQrQ2LT3jN1V3Qh076dm5NuLG7NZQOTUh0e3+LL/jp maUUuttjeNOStGtRtLzHT7CRD+IyUV994HUgbPuN77+ax/7b74OSWZLLf5WV0SIPwsyK v+KxVB8VM/E1p64YtdqCBBG+jAViL0dOVqrIu3mF/BkdZeba/G89A9XhSeBL4rERpnRQ gQCnaAXL2QEFkkOIRHPYARxss0YEZzslqZKHPwkEJzOhBrfvOU1x5fj/d1lV22r7B4Lf DziQ== X-Gm-Message-State: AOUpUlFo7awn5daUl9E9Tj11+miTgDrIo3X/nSyUKbBmN2bKnt5oDaVx L/SgXotyCDsi/3ZaKWoxuSokhnQhGgM= X-Received: by 2002:a5d:494c:: with SMTP id r12-v6mr3955784wrs.66.1531908316352; Wed, 18 Jul 2018 03:05:16 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u3-v6sm3646593wre.21.2018.07.18.03.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 18 Jul 2018 03:05:12 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 000D03E061C; Wed, 18 Jul 2018 11:05:05 +0100 (BST) From: =?utf-8?q?Alex_Benn=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: Wed, 18 Jul 2018 11:05:05 +0100 Message-Id: <20180718100505.7546-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180718100505.7546-1-alex.bennee@linaro.org> References: <20180718100505.7546-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH RFC 10/10] tests/tcg: debian-mips64el-user-cross fallback 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, Aleksandar Markovic Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When we can't use the debian-mips64el-cross to build our tests we can use the user-cross fallback. Signed-off-by: Alex Bennée --- tests/tcg/mips/Makefile.include | 5 +++++ 1 file changed, 5 insertions(+) -- 2.17.1 diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.include index 4a14fc078d..cc82e586fd 100644 --- a/tests/tcg/mips/Makefile.include +++ b/tests/tcg/mips/Makefile.include @@ -6,8 +6,13 @@ # ifeq ($(TARGET_NAME),mips64el) +ifneq ($(ARCH),x86_64) +DOCKER_IMAGE=debian-mips64el-user-cross +DOCKER_CROSS_COMPILER=gcc +else DOCKER_IMAGE=debian-mips64el-cross DOCKER_CROSS_COMPILER=mips64el-linux-gnuabi64-gcc +endif else ifeq ($(TARGET_NAME),mips64) DOCKER_IMAGE=debian-mips64-cross DOCKER_CROSS_COMPILER=mips64-linux-gnuabi64-gcc