From patchwork Tue Sep 10 08:43:20 2019 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: 173461 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5513075ilq; Tue, 10 Sep 2019 02:00:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoG9zu6n0tlImw3CwOuZMmAfO+E5XEE9WV6o46ClIBt4I6QsxRiz2dHSN/NY9dPEuzj8CT X-Received: by 2002:a05:620a:146c:: with SMTP id j12mr28800943qkl.105.1568106054409; Tue, 10 Sep 2019 02:00:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568106054; cv=none; d=google.com; s=arc-20160816; b=so9X6XvJqfoR5j6F94xFw0y/liCyNspaIYtLU2ZADrEm/zkldB7LrVIImpIaDhO/9b l9Nez2THnQ/DkBU+C24zpO9Cg0pKLzbDBfstws812icHQTwAlzjgjPD5JPf1rMPs/W91 JtJLZvGXdqMsV1Rww5OmsA8KPaFA088paeLCUS4VoIjPBRTF2tRWpOHksuvKXEXL2cgX cbI7HzZuBnNRH11tRmeA22hMBuQt2E4nGcTP5zhVoVXcm3jL5kZbILp7jOhLVSmnAgym NCijh8Z5kEIG5rLiFyoSNJvH5oMPPGwVYEu6vAxIYZwos4Sx0NDC79tTuI2khbRw3sNG VCdA== 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; bh=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=u0MB1SJ/v/SeL6bEN7fC8XtnmZgKlnuuf45IaRw7N0BXxcqEjAigV+MAbVAYx2+t/U zcSx9akAdySX1GNzPyeuHvcTjKiOLSmfZKIcj7UjRNKwe5HoE/4i9zIhRFDgkrCEBAae vsg4lnQ9tpO5jexMayXdxawFdRWb8U9jRsZTtOJs1/Mcztktvc0mfjhu5Rlwv3s0lyZP n3fvYeZ8vnZgd9a0q4Qrl6EkwxF428jsvsg34+DwVpjK4KEry1qB7Nb0crjzBW+1rU0U 8Vmd/ofuQXlOhdtGvvAzkejVbv7QEqIPtD9XBTC6/k3WvG15EgnGbqa4iq8iCa5WHsIU r2yQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qU4bPTeg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id y46si12669603qtb.188.2019.09.10.02.00.54 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 02:00:54 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=qU4bPTeg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:35988 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7c17-0004WV-Az for patch@linaro.org; Tue, 10 Sep 2019 05:00:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35884) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bko-0003R1-E8 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkn-0006N0-7n for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:02 -0400 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]:41208) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkn-0006MQ-1V for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:44:01 -0400 Received: by mail-wr1-x433.google.com with SMTP id h7so17351139wrw.8 for ; Tue, 10 Sep 2019 01:44:00 -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=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=qU4bPTegIGs32n+szlRYVazm6cXbJ1U7YJiBgIya8GIFOtYtBJqsy3cHSHRaADnaB8 DvQLghSd44xxOR4sC01cUtaYnsJLAngt0ZRiTQvO0o5iuX/uQD/5FvxXCCr9Q40WI5Ch 7GYcPaJe55rrxr3k79XuUoICSNxeRKAP9xCw91/FgUX8zmWTR/drljePd4s6TXSiONKD WBVwN3N9/3s2m35yTznHScT1HhP9NrPKnWqdm7KR4PxxJnXLeOs6Ix1oeMg9KGpSEss+ fZePPNc1UDfvWUjEWQuEB4U3SSUhI07Dh36y07kleBdF0ueft1R45YD5ooQ+ygr4dMLx EA7w== 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=1H1FAu7VydYddKbuodTRw29LVFATt0J64Dq/I7de+uw=; b=c689aAV9WIjDY5/99kssCAkH5F1DkzSoNT+hU48AaBoij/1GngEdo4tRPSiZixT5kH j3CgHmYh7YaKA96lIOqElFQkNfrbL54nPRyfyNjdKQXvwWRLnVdFj0+i4Pe/al3mXwlj QXwh7LJPZOr1kStZ7nGtuc3oewKYku/ZcR1TPq5IiQFkEKzHEuu4y1Y9ahLhuQWtBFrN R9bbbqOIEN1TAdprKzMKYQAJSNRgeZWLscoeT3Xsrw4mWGpzTHPbup2nrL0F8aJrq6wh fhrlV1xSfCOb/JFSmJWyTouLPl+ZxOvSpMHILL6v3QuhpjuvWPd+uGp+ky1c+85saPiJ kRxQ== X-Gm-Message-State: APjAAAXRvVIltHm7xZOKGh6ykq26sRoRWBs0GvJ4n1Qhx87CD+8tx57P kEwFnFajkEARMfFlIVpER6uxIA== X-Received: by 2002:adf:ed0f:: with SMTP id a15mr4760582wro.49.1568105039941; Tue, 10 Sep 2019 01:43:59 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g24sm26485161wrb.35.2019.09.10.01.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:58 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 10B021FF9F; Tue, 10 Sep 2019 09:43:51 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:20 +0100 Message-Id: <20190910084349.28817-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::433 Subject: [Qemu-devel] [PULL 16/45] tests/docker: move our Alpha cross compile to Buster X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé -- 2.20.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 7c1ff677a13..e7379f1d732 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -98,10 +98,10 @@ docker-image-debian-s390x-cross: docker-image-debian9 docker-image-debian-win32-cross: docker-image-debian9-mxe docker-image-debian-win64-cross: docker-image-debian9-mxe +docker-image-debian-alpha-cross: docker-image-debian10 docker-image-debian-arm64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 -docker-image-debian-alpha-cross: docker-image-debian-sid docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid docker-image-debian-sh4-cross: docker-image-debian-sid diff --git a/tests/docker/dockerfiles/debian-alpha-cross.docker b/tests/docker/dockerfiles/debian-alpha-cross.docker index 23444342f03..74bcabfdb12 100644 --- a/tests/docker/dockerfiles/debian-alpha-cross.docker +++ b/tests/docker/dockerfiles/debian-alpha-cross.docker @@ -1,13 +1,12 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \ apt 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; } + libc6.1-dev-alpha-cross