From patchwork Fri Jun 8 12:32:49 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: 138046 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp906568lji; Fri, 8 Jun 2018 06:58:38 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKjCKokVq5PbIvSgabIVZNXprvvcfdVHmpBIZVl+gwNWWPnh8ALHXZgZrOLuUlg9Hmo6PPd X-Received: by 2002:a37:9bd4:: with SMTP id d203-v6mr5333208qke.122.1528466318649; Fri, 08 Jun 2018 06:58:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528466318; cv=none; d=google.com; s=arc-20160816; b=oKc1azUjaqyqgXadYc594U8QwUTZR9GYI5ySCs1b+jYiWwiTwrD4az2E4DRr71lCaJ hV8xzGblppZyY+GfTvygKsDETwRUPu3myEHDqyyTfEbqdsAUCcp4niqzz7o7kIju9xTU bXTOTrdgMfr/KLAddJ2YPOMC8//K2jjDtX0Q1CX1KWdyPhTJ/+Ln3vi4n1vxjjAaSGvu GS/2jcEY9ZCZKOVhtOxCy9aMiNqwAwXqsIK+URd9GmvW7uvlRZH5QpeH3z99JWK8bouk +mB5OP9Ysm/tz5Bvwuw3vfkRGGa5NV9SOByoKvK3G/gTZbLsU46sF+j/ocnQApcDwhRl h8cQ== 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=EBus5Csc6B7lfK3KtWXXhGuM6fD3wo83t51jTN/D1kk=; b=xhIe4IbIHByvJlOqviQ6yBV5+riMDy20XbSyEWF8anToEDwKxDDNGH3NSZw3NO4FJv FEei+gVmQvLnKUL5zVuQyyXcqQRpv+1x40IPYelHalK/6I9rZgjqc6lGXeW9FiXHKgBb v/OyNFpa+PuhovCkTKT+QeCXmy8Z2CSUKCJNDqRqPyurOmuqzf4kQzopqWunBet6CBGT 8c+2bHNEBIaeEVmsGw0WJkS0PYn7DKVSJkjlpsWHxRSqKLB0GQIAL4MpMh3cn3lArWFg EsXJYVJSfbNiqaUBPjFT/vxPLWNaMMh5zjw2cDl6ESBjvAeS8Rnt0TwABPAEPodRin+g V3Jg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KDGKo6me; 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-v6si5669186qvk.217.2018.06.08.06.58.38 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 06:58:38 -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=KDGKo6me; 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]:35834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRHuY-0004Lx-3B for patch@linaro.org; Fri, 08 Jun 2018 09:58:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51970) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGpY-00061e-15 for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGpV-0006na-QN for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:24 -0400 Received: from mail-wm0-x235.google.com ([2a00:1450:400c:c09::235]:52650) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGpV-0006mh-Hz for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:49:21 -0400 Received: by mail-wm0-x235.google.com with SMTP id p126-v6so3165901wmb.2 for ; Fri, 08 Jun 2018 05:49:21 -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=EBus5Csc6B7lfK3KtWXXhGuM6fD3wo83t51jTN/D1kk=; b=KDGKo6mekhVpV/Uf3gSJ90wZrkXExM00jSS2BstUuZVXP/lCPGtOULPic7x5wkNYPm NEmaUlsSfGJjp7qgbHt0+wsXlf6voIcye6dWH3oxg7maT07iNrlFPWAir/UXFFJ1X3h5 LJEzVVrQbBegkq3LVl1qE6wY9NLl4VnQj5+C8= 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=EBus5Csc6B7lfK3KtWXXhGuM6fD3wo83t51jTN/D1kk=; b=Woaowqjqha0S2igVyxPmxSgqQ51qd8hcUVHwJ+9reY25S/9ToCkFHqB47KydHgVYHM yasLYCBy0At8rSnQ8j3OMNW8VRw6bgD8FwD/C99sfeYBd4BJ2+4KWnuCFEkXDM6boD9Q QO6saAnYWxkYJG1dUDuqFjZNp5D2aPaYZCDLw8EqeV06W3g2we1eginNiodYaa6xweti /D06PK/tL4xzsSA1OkuQmxebTt+ybk0Eh99FRZgba1yMvQqS20qpLKAY97uxyYRN5/O8 PYK0dy5NcZRRWfaeBPo7/VHEbSyX2zTS6S1imslk+Rdmtyk6VMGlW4X2lyodOaVMpGEC yBAg== X-Gm-Message-State: APt69E2idYwFoqM6pRF9MZlcy5DrGLtzfVm8JuezbX8WpKYX5S8bQBGu iKlSpb/56vO97DqdqiyJkYbqmw== X-Received: by 2002:a1c:8742:: with SMTP id j63-v6mr1373318wmd.105.1528462160355; Fri, 08 Jun 2018 05:49:20 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h65-v6sm1333221wmf.7.2018.06.08.05.49.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:49:15 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CB8F93E0C98; Fri, 8 Jun 2018 13:33:09 +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, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:49 +0100 Message-Id: <20180608123307.24773-32-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-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::235 Subject: [Qemu-devel] [PATCH v6 31/49] 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 8afb383478..1a4664c04e 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -63,6 +63,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