From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908597938858.4988478127397; Wed, 18 Jul 2018 03:09:57 -0700 (PDT) Received: from localhost ([::1]:35681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjPA-0006Vx-Pk for importer@patchew.org; Wed, 18 Jul 2018 06:09:56 -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) 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) 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-Google-Smtp-Source: AAOMgpc7/xBuFJSv96YZ/btkFNf0l9VnWn4ijwnNYsetUn7uJRutoNTqyzXxgL75odYQCJ2RKkx7tQ== X-Received: by 2002:adf:c08c:: with SMTP id d12-v6mr3766526wrf.268.1531908307166; Wed, 18 Jul 2018 03:05:07 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- .../dockerfiles/{debian-amd64.docker =3D> debian-host.docker} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename tests/docker/dockerfiles/{debian-amd64.docker =3D> debian-host.dock= er} (91%) diff --git a/tests/docker/dockerfiles/debian-amd64.docker b/tests/docker/do= ckerfiles/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 && ./config= ure --with-glx --disabl # netmap RUN DEBIAN_FRONTEND=3Dnoninteractive 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 --kerne= l-dir=3D$(ls -d /usr/src/linux-headers-*-amd64) && make install +RUN cd /usr/src/netmap/LINUX && ./configure --no-drivers --no-apps --kerne= l-dir=3D$(ls -d /usr/src/linux-headers-*) && make install ENV QEMU_CONFIGURE_OPTS --enable-netmap =20 # gcrypt --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908453887565.2041952678288; Wed, 18 Jul 2018 03:07:33 -0700 (PDT) Received: from localhost ([::1]:35669 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjMk-0004OL-Ij for importer@patchew.org; Wed, 18 Jul 2018 06:07:26 -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) 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) 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-Google-Smtp-Source: AAOMgpdOSCbxhndAmT8ssRENU746vrv5i5bxgnznbQhCbWTmZdDsl2CRQFRICBd38bDgKkrkVStCIA== X-Received: by 2002:a1c:14c3:: with SMTP id 186-v6mr1088184wmu.21.1531908308354; Wed, 18 Jul 2018 03:05:08 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We 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=C3=A9e --- tests/docker/Makefile.include | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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 :=3D debian # we don't run tests on intermediate images (used as base by another image) DOCKER_PARTIAL_IMAGES :=3D debian debian8 debian9 debian8-mxe debian-ports= debian-sid debian-bootstrap DOCKER_IMAGES :=3D $(filter-out $(DOCKER_DEPRECATED_IMAGES),$(sort $(notdi= r $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))) -DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(DOCKER_IMAGES)) # Use a global constant ccache directory to speed up repetitive builds DOCKER_CCACHE_DIR :=3D $$HOME/.cache/qemu-docker-ccache =20 @@ -34,8 +33,6 @@ $(DOCKER_SRC_COPY): =20 docker-qemu-src: $(DOCKER_SRC_COPY) =20 -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),$(DO= CKER_IMAGES) $(DOCKER_DEPR ) \ ) =20 +# Expand a rule to build all useable images +DOCKER_TARGETS :=3D $(patsubst %,docker-image-%,$(filter-out $(DOCKER_PART= IAL_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 na= me,' @echo ' or a script name under $$QEMU_SRC/tests/d= ocker/;' @echo ' "IMAGE" is one of the listed container na= me."' - @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 --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908453906677.76581743634; Wed, 18 Jul 2018 03:07:33 -0700 (PDT) Received: from localhost ([::1]:35670 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjMk-0004OT-Ls for importer@patchew.org; Wed, 18 Jul 2018 06:07:26 -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) 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) 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-Google-Smtp-Source: AAOMgpdVLNF2UhgQ7ud6XND2HOoZZAbAguGY9AnqHLU3qUPUMJTimnI+9/hLXUP1x4IquQdWHLsdaQ== X-Received: by 2002:adf:91e5:: with SMTP id 92-v6mr3957994wri.124.1531908310142; Wed, 18 Jul 2018 03:05:10 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We want to keep all our variations in one place. This is that place. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 +=3D debian-powerpc-user # tests due to missing system call: 249 which causes an abort DOCKER_PARTIAL_IMAGES +=3D debian-powerpc-user-cross =20 +# 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) $(DOCKE= R_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908710119179.5970820208329; Wed, 18 Jul 2018 03:11:50 -0700 (PDT) Received: from localhost ([::1]:35695 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjQy-0008GW-8K for importer@patchew.org; Wed, 18 Jul 2018 06:11:48 -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) 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) 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-Google-Smtp-Source: AAOMgpd+MQlaJt05R+sASouzMjANivG5P8iZbh6VNPLvwJob3fvAr8zkXc8yZdaPAxajFIGFumJJlA== X-Received: by 2002:adf:eb4c:: with SMTP id u12-v6mr1310133wrn.174.1531908309143; Wed, 18 Jul 2018 03:05:09 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Attempting to install the native compiler as a cross compiler rarely goes well. Signed-off-by: Alex Benn=C3=A9e --- tests/docker/Makefile.include | 4 ++++ 1 file changed, 4 insertions(+) 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 +=3D debian-powerpc-user-cross =20 ifneq ($(ARCH),x86_64) =20 +ifeq ($(ARCH),aarch64) +# no point having a cross compiler when it is the native one +DOCKER_PARTIAL_IMAGES +=3D debian-arm64-cross +endif =20 endif =20 --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908599422271.0639954232179; Wed, 18 Jul 2018 03:09:59 -0700 (PDT) Received: from localhost ([::1]:35682 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjPC-0006Ya-FV for importer@patchew.org; Wed, 18 Jul 2018 06:09:58 -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) 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) 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-Google-Smtp-Source: AAOMgpd1emLhDI4p/Rg8QSepxpr3YWvOqdc7saJMchX3aolFK6YBTnyQjBlM7QSbVmHPxST+Ya5yUA== X-Received: by 2002:adf:b2f4:: with SMTP id g107-v6mr4069541wrd.53.1531908312169; Wed, 18 Jul 2018 03:05:12 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- 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.doc= ker 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 +=3D debian-arm64-cross endif =20 +# No MIPS cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-mips64el-user: DEB_ARCH =3D mips64el +docker-binfmt-image-debian-mips64el-user: DEB_TYPE =3D stretch +docker-binfmt-image-debian-mips64el-user: EXECUTABLE =3D ${BUILD_DIR}/mips= 64el-linux-user/qemu-mips64el +docker-image-debian-mips64el-user-cross: docker-binfmt-image-debian-mips64= el-user +DOCKER_USER_IMAGES +=3D debian-mips64el-user-cross +DOCKER_PARTIAL_IMAGES +=3D debian-mips-cross debian-mipsel-cross debian-mi= ps64el-cross + +else +DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-user-cross endif =20 + # Expand all the pre-requistes for each docker image and test combination $(foreach i,$(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGES) $(DOCKE= R_DEPRECATED_IMAGES)), \ $(foreach t,$(DOCKER_TESTS) $(DOCKER_TOOLS), \ diff --git a/tests/docker/dockerfiles/debian-mips64el-user-cross.docker b/t= ests/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=3Dnoninteractive apt-get build-dep -yy qemu --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908595061471.20438893049516; Wed, 18 Jul 2018 03:09:55 -0700 (PDT) Received: from localhost ([::1]:35680 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjP8-0006TC-65 for importer@patchew.org; Wed, 18 Jul 2018 06:09:54 -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) 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) 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-Google-Smtp-Source: AAOMgpcbYkEo0EnZIvHOexQ+avCg4+n85ZvdgkjDvD1dmDztAX6oI4Pzd8schnhtt/nviGZxQfCx3A== X-Received: by 2002:a5d:4701:: with SMTP id y1-v6mr3944528wrq.107.1531908311133; Wed, 18 Jul 2018 03:05:11 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- 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.dock= er 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 +=3D debian-mips64el-user-cross DOCKER_PARTIAL_IMAGES +=3D debian-mips-cross debian-mipsel-cross debian-mi= ps64el-cross =20 +# No ppc64el cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-ppc64el-user: DEB_ARCH =3D ppc64el +docker-binfmt-image-debian-ppc64el-user: DEB_TYPE =3D stretch +docker-binfmt-image-debian-ppc64el-user: EXECUTABLE =3D ${BUILD_DIR}/ppc64= le-linux-user/qemu-ppc64le +docker-image-debian-ppc64el-user-cross: docker-binfmt-image-debian-ppc64el= -user +DOCKER_USER_IMAGES +=3D debian-ppc64el-user-cross +DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross + else -DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-user-cross +DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-user-cross debian-ppc64el-user-= cross endif =20 =20 diff --git a/tests/docker/dockerfiles/debian-ppc64el-user-cross.docker b/te= sts/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=3Dnoninteractive apt-get build-dep -yy qemu --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908451066116.57077140643025; Wed, 18 Jul 2018 03:07:31 -0700 (PDT) Received: from localhost ([::1]:35671 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjMn-0004Rx-Vn for importer@patchew.org; Wed, 18 Jul 2018 06:07:30 -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) 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) 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-Google-Smtp-Source: AAOMgpf2X5Img8HHVgjWD2XSbDI+P/MnUGv3HvdJGamiF97Y5VAdj1HEbpcG0pnShuy6Zw8FV9YonA== X-Received: by 2002:adf:d08c:: with SMTP id y12-v6mr4070262wrh.152.1531908313647; Wed, 18 Jul 2018 03:05:13 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- 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 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 +=3D debian-ppc64el-user-cross DOCKER_PARTIAL_IMAGES +=3D debian-ppc64el-cross =20 +# No s390x cross-compilers in non-x86 Debian images, so use linux-user +docker-binfmt-image-debian-s390x-user: DEB_ARCH =3D s390x +docker-binfmt-image-debian-s390x-user: DEB_TYPE =3D stretch +docker-binfmt-image-debian-s390x-user: EXECUTABLE =3D ${BUILD_DIR}/s390x-l= inux-user/qemu-s390x +docker-image-debian-s390x-user-cross: docker-binfmt-image-debian-s390x-user +DOCKER_USER_IMAGES +=3D debian-s390x-user-cross +DOCKER_PARTIAL_IMAGES +=3D debian-s390x-cross else -DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-user-cross debian-ppc64el-user-= cross +DOCKER_PARTIAL_IMAGES +=3D debian-mips64el-user-cross debian-ppc64el-user-= cross debian-s390x-user-cross endif =20 =20 diff --git a/tests/docker/dockerfiles/debian-s390x-user-cross.docker b/test= s/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=3Dnoninteractive apt-get build-dep -yy qemu --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908822692297.210395249405; Wed, 18 Jul 2018 03:13:42 -0700 (PDT) Received: from localhost ([::1]:35702 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjSe-0001JP-Ks for importer@patchew.org; Wed, 18 Jul 2018 06:13:32 -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) 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) 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-Google-Smtp-Source: AAOMgpcDoQ8ysA6nkaXiDTHkir7Z18Vhd3Fyfvzk9cOYr2pKA3uVMPg9385niLBGrE92/G97syZayA== X-Received: by 2002:adf:e90c:: with SMTP id f12-v6mr3968377wrm.126.1531908314405; Wed, 18 Jul 2018 03:05:14 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 - 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=C3=A9e --- tests/docker/Makefile.include | 7 +++++++ 1 file changed, 7 insertions(+) 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 +=3D debian-powerpc-user-cross =20 ifneq ($(ARCH),x86_64) =20 +# Don't include non-multiarch images +DOCKER_PARTIAL_IMAGES +=3D travis centos7 + ifeq ($(ARCH),aarch64) # no point having a cross compiler when it is the native one DOCKER_PARTIAL_IMAGES +=3D debian-arm64-cross +# hub.docker.com's older Debian images are not multiarch +DOCKER_PARTIAL_IMAGES +=3D debian-win32-cross debian-win64-cross +# older Ubuntu's need fixing up as well +DOCKER_PARTIAL_IMAGES +=3D ubuntu endif =20 # No MIPS cross-compilers in non-x86 Debian images, so use linux-user --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908708301542.9008490516318; Wed, 18 Jul 2018 03:11:48 -0700 (PDT) Received: from localhost ([::1]:35694 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjQx-0008Fw-9U for importer@patchew.org; Wed, 18 Jul 2018 06:11:47 -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) 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) 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-Google-Smtp-Source: AAOMgpcRX+9TCw8ybTbvh3oI3lMBQFxDY/tQd5XGDwBp4dZxqlqn1EbyojBlTgTOkV80W7iI6qKejQ== X-Received: by 2002:a1c:9e4d:: with SMTP id h74-v6mr1242500wme.70.1531908315374; Wed, 18 Jul 2018 03:05:15 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::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=20Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We 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=C3=A9e --- Makefile | 4 +++- tests/tcg/Makefile.include | 3 +++ tests/tcg/Makefile.probe | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2da686be33..6bb8035557 100644 --- a/Makefile +++ b/Makefile @@ -434,6 +434,9 @@ dummy :=3D $(call unnest-vars,, \ audio-obj-m \ trace-obj-y) =20 +# 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 =20 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) =20 -include $(SRC_PATH)/tests/docker/Makefile.include include $(SRC_PATH)/tests/vm/Makefile.include =20 .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 =20 +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) + DOCKER_COMPILE_CMD=3D"$(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) =20 GUEST_BUILD=3Ddocker-build-guest-tests =20 +endif endif endif =20 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:=3D -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.include =20 ifndef CROSS_CC_GUEST -ifneq ($(DOCKER_IMAGE),) +ifneq ($(filter-out $(DOCKER_PARTIAL_IMAGES),$(DOCKER_IMAGE)),) DOCKER_PREREQ:=3Ddocker-image-$(DOCKER_IMAGE) endif endif --=20 2.17.1 From nobody Sat May 4 22:15:30 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1531908822844146.37937860087004; Wed, 18 Jul 2018 03:13:42 -0700 (PDT) Received: from localhost ([::1]:35703 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ffjSf-0001K6-IG for importer@patchew.org; Wed, 18 Jul 2018 06:13:33 -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) 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) 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-Google-Smtp-Source: AAOMgpenA049v6fs8dSXtws0bm7jRvdauzjroPO8BuRRrSeZwPGXQV732RbpBtWoQbCLK1nBrMsHoQ== X-Received: by 2002:a5d:494c:: with SMTP id r12-v6mr3955784wrs.66.1531908316352; Wed, 18 Jul 2018 03:05:16 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de Date: 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450: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=20Benn=C3=A9e?= , qemu-devel@nongnu.org, Aleksandar Markovic Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9e --- tests/tcg/mips/Makefile.include | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.incl= ude index 4a14fc078d..cc82e586fd 100644 --- a/tests/tcg/mips/Makefile.include +++ b/tests/tcg/mips/Makefile.include @@ -6,8 +6,13 @@ # =20 ifeq ($(TARGET_NAME),mips64el) +ifneq ($(ARCH),x86_64) +DOCKER_IMAGE=3Ddebian-mips64el-user-cross +DOCKER_CROSS_COMPILER=3Dgcc +else DOCKER_IMAGE=3Ddebian-mips64el-cross DOCKER_CROSS_COMPILER=3Dmips64el-linux-gnuabi64-gcc +endif else ifeq ($(TARGET_NAME),mips64) DOCKER_IMAGE=3Ddebian-mips64-cross DOCKER_CROSS_COMPILER=3Dmips64-linux-gnuabi64-gcc --=20 2.17.1