From patchwork Fri Jun 15 19:46:44 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: 138807 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp1286268lji; Fri, 15 Jun 2018 13:30:25 -0700 (PDT) X-Google-Smtp-Source: ADUXVKK/WHx7YvgSocQpOVHVGUuQ8npU+js/e+Ilpt2s1hMqUAiUbjpNVii92L1aWJbnIOogwNAi X-Received: by 2002:a37:4792:: with SMTP id u140-v6mr2742759qka.100.1529094625592; Fri, 15 Jun 2018 13:30:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529094625; cv=none; d=google.com; s=arc-20160816; b=KqLXNAkvs2sIYiN6ZK2BxJNsSSvNynmITFwgDS3/TbwtdSrBxAyeq7eBI/hUzPZFe4 ROh9u7EedkWdDlcI9rTjnj+M92sR9Oijm3cG48EhU1pbMZzsd0xedrdqnK2JlGRgSKph 3UkOuHiLeVzqE+ps4YY5eOiIFw4xuHEYGdvpKmM4eTr0zosUEdjy8H/7CjB56lUtWDBc +rPp93oRZmSs4e2IZ43rjOess/wmOazdljn7MO/BxaWKsPpZlOBowfISIVL6PinbXluT 4HUctiRNCyMFS8Wnel0iZAZb47qXd6B0HYO+M7Sm7MlrU371Epr+uE13lOWTl3XoDtFd 7MRQ== 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=70qIGAP1S1ugXwsQqmb07Oy/pcrPozZSYg7TzIKx4j4=; b=MwbIpvfXunypOnZe5myIBDemyLl/oyXzxfyD+ZUguc2zg/eI7rsZe7iGSIaSRXx6DC k6dxmXzMlPtRr/mq15sVhtakLUaHcpG3LznoGeqhC22ofDkkE8iHf2rfspBla9P7THc5 MPJEddfIdl2ObL74/01NafgesVECtkWgd7ocFAJ2qunpgEsxQRTrDxSpRAn6ptKnFqiu mBvYqxt5H+c11Qz8SwolQzmN+pwZjIUQg4Co96um9b+Q7RubDTdHYo+5l0mPwjkjhB6o Akoy2NDXlKkkyMwogyiNxkIdZAf+T3KIuUWPbgiSbKlTvHqqEbx3gDC2GYMbEG9POD8J hEXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Eb2KPM4J; 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 g7-v6si57093qvj.177.2018.06.15.13.30.25 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 15 Jun 2018 13:30:25 -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=Eb2KPM4J; 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]:49229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTvMX-0003B0-1X for patch@linaro.org; Fri, 15 Jun 2018 16:30:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fTuoi-0000lQ-Hk for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fTuof-0006qy-LF for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:28 -0400 Received: from mail-wr0-x234.google.com ([2a00:1450:400c:c0c::234]:45042) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fTuof-0006pu-AZ for qemu-devel@nongnu.org; Fri, 15 Jun 2018 15:55:25 -0400 Received: by mail-wr0-x234.google.com with SMTP id x4-v6so10974915wro.11 for ; Fri, 15 Jun 2018 12:55:25 -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=70qIGAP1S1ugXwsQqmb07Oy/pcrPozZSYg7TzIKx4j4=; b=Eb2KPM4Ju4ILb9+N8AJgvLQT0y8+nEcFwsUPiqigsSGAZ86F9M90suCPZ8bdRObfAA /k0MO4RhsZy/3zSi6z+hrhupfuIFadWmbgoHDXp2Klae0uatYqv5pPSYkrpdRM4QLnon nGAVEuEubBSaF5oEr8QDbmZhWBq1sd1eKzhb4= 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=70qIGAP1S1ugXwsQqmb07Oy/pcrPozZSYg7TzIKx4j4=; b=Tr/2PZ2UKxVjTwD6pCRIojftXdyZhQzNRvmB+lo8SM759cQGx3TyyGyFQ+f/O0NbXv XdnDs2rrDW81wO2uNHKALDqUpiLyxQleffamgxdxRLQkxv6KY8wYjd4z0V7Hq1gz6cgZ /FDwyh8qRRuFqSo6Wc90xloc/lHPRDOwTaOUI/8eEqhnMs/KBK0awH7BMyN/IQrucE0z ZoOl3Hcqy6j9qdguIyMzyOiZ5GQ7NQSWcPZ7E6jryGSZMhSGqXTlnoKb8pWrq1ilCmC7 74sZX8bmoM30apty+cb9h7p2J3XbSX54R3wC5lfUu8F3SNQQXWahI0NXTgJCCWpOmGss kv1g== X-Gm-Message-State: APt69E3554ID0KRIl24t7eR2NNfQrLnxfW/H+mHbPSn3PQTlX1oF4dgK vwV+aYS5hR9bwc620LLwShtSMA== X-Received: by 2002:adf:ac69:: with SMTP id v96-v6mr2672650wrc.5.1529092524108; Fri, 15 Jun 2018 12:55:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e2-v6sm9998773wro.97.2018.06.15.12.55.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 15 Jun 2018 12:55:19 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4EDC23E0D7F; Fri, 15 Jun 2018 20:47:08 +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, peter.maydell@linaro.org Date: Fri, 15 Jun 2018 20:46:44 +0100 Message-Id: <20180615194705.28019-34-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180615194705.28019-1-alex.bennee@linaro.org> References: <20180615194705.28019-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:c0c::234 Subject: [Qemu-devel] [PATCH v7 33/54] tests/tcg: enable building for Alpha 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, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We can't use our normal Debian based compilers as Alpha isn't an officially supported architecture. However it is available as a port and fortunately cross compilers for all these targets are included in Debian Sid, the perpetual rolling/unstable/testing version of Debian. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v5 - drop the unused debian-cross-build docker image - add note to debian-sid docker image - echo reference to notes on build failure - include EXTRA_RUNS for mmap tests v6 - use NOCACHE=1 for docker-image-debian-sid to force re-builds - this seems a little hacky --- tests/docker/Makefile.include | 7 ++++ .../dockerfiles/debian-alpha-cross.docker | 12 +++++++ tests/docker/dockerfiles/debian-sid.docker | 32 +++++++++++++++++++ tests/tcg/alpha/Makefile.include | 2 ++ tests/tcg/alpha/Makefile.target | 6 ++++ 5 files changed, 59 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-alpha-cross.docker create mode 100644 tests/docker/dockerfiles/debian-sid.docker create mode 100644 tests/tcg/alpha/Makefile.include create mode 100644 tests/tcg/alpha/Makefile.target -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 4a2b028a3b..8c24f8807e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -64,6 +64,13 @@ docker-image-debian-ppc64el-cross: docker-image-debian9 docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian8-mxe docker-image-debian-win64-cross: docker-image-debian8-mxe + +# Debian SID images - we are tracking a rolling distro so we want to +# force a re-build of the base image if we ever need to build one of +# its children. +docker-image-debian-sid: NOCACHE=1 + +docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 # Specialist build images, sometimes very limited tools diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker new file mode 100644 index 0000000000..29a25d0dfd --- /dev/null +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -0,0 +1,12 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the debian sid base image which +# contains cross compilers for Debian "ports" targets. +# +FROM qemu:debian-sid + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + gcc-alpha-linux-gnu \ + libc6.1-dev-alpha-cross || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker new file mode 100644 index 0000000000..9a3d168705 --- /dev/null +++ b/tests/docker/dockerfiles/debian-sid.docker @@ -0,0 +1,32 @@ +# +# Debian Sid Base +# +# A number of our guests exist as ports only. We can either use the +# ports repo or get everything from Sid. However Sid is a rolling +# distro which may be broken at any particular time. If you are +# unlucky and try and build your images while gcc is in the process of +# being uploaded this can fail. Your only recourse is to try again in +# a few hours when the repos have re-synced. Once built however you +# won't be affected by repo changes unless the docker recipies are +# updated and trigger a re-build. +# + +FROM debian:sid-slim + +# Duplicate deb line as deb-src +RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list + +# Install common build utilities +RUN apt update +RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + flex \ + git \ + pkg-config \ + psmisc \ + python \ + texinfo || { echo "Failed to build - see debian-sid.docker notes"; exit 1; } diff --git a/tests/tcg/alpha/Makefile.include b/tests/tcg/alpha/Makefile.include new file mode 100644 index 0000000000..c7dc48eadb --- /dev/null +++ b/tests/tcg/alpha/Makefile.include @@ -0,0 +1,2 @@ +DOCKER_IMAGE=debian-alpha-cross +DOCKER_CROSS_COMPILER=alpha-linux-gnu-gcc diff --git a/tests/tcg/alpha/Makefile.target b/tests/tcg/alpha/Makefile.target new file mode 100644 index 0000000000..bedf1b6444 --- /dev/null +++ b/tests/tcg/alpha/Makefile.target @@ -0,0 +1,6 @@ +# -*- Mode: makefile -*- +# +# Alpha specific tweaks + +# On Alpha Linux only supports 8k pages +EXTRA_RUNS+=run-test-mmap-8192