From patchwork Fri Mar 27 18:13:16 2020 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: 185013 Delivered-To: patch@linaro.org Received: by 2002:a92:de47:0:0:0:0:0 with SMTP id e7csp1610384ilr; Fri, 27 Mar 2020 11:15:39 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuis4NqllUs5daskOV+/Bv7FcwycBWL78GQZJodWcV3NoXjR+RAmb4/sSVUKgdIIuVmzQdT X-Received: by 2002:ae9:efce:: with SMTP id d197mr596288qkg.211.1585332939709; Fri, 27 Mar 2020 11:15:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585332939; cv=none; d=google.com; s=arc-20160816; b=tEzJmFX9udcbtEUx04kjypjfZFwhFn1wZQO2fjjbHrrc2K5q1iaHSZEzmZnGTZjLPB UpSqX05k3AQUOZADGSKRGFZzvFCRPWgLjSHmqEMhx+ODUpVSmYqkdyqkMnVvwKylglfA Bqwox5cn4A0L+zGRFqa1nUNXwomlZpscKx8KosTmWkyCZjE96UKd0Kvq8xSzMUL+FEnG +4/njVikIP6nm5gE2clFYpJFxX95DPqIPDfAnEtSZxFA0TMkqbltUHERswA2n3B26vE8 svQom0DqwCNGeh0P5Gkz2ETIKTIy4Fp3n5iDJ0xsZTFgvPmdOJECC7kGNClQZOS+r+5t m2Eg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=to077w3si4EpMxr1LQLkzHeZLF5upwhFg9YdlZjfBewYd2oqxR3rqieqtpM5IQIe1G 2gYXVQBlATPw7+shdqhCd5rlIPhqkIbNpmmmsIKOIZrRu/5Q7h1o/YnCugAwvUURVvIo EtTrBMglZ6LjPNu1ERGklhY1Q156KXwRcx3jdYXSmwplaUm7FJZouQLv8q49A5f0/H0h Zw0ovcFe8Nb6n/run1CtEcwNZ7gTh4SpilOOupU263p7oyvu7h7M3BXDbA/X204bkTd/ RdbWVrngKRJ1UhxW+tSBQ66sSKdu2QmDCFmCUY+EOUIGvZh0TRIpruDSeeUCKtqqdJxs L5Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Jg3uVjPQ; 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 v17si3711564qtk.303.2020.03.27.11.15.39 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Mar 2020 11:15:39 -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=Jg3uVjPQ; 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]:45322 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtW7-0005Jf-4a for patch@linaro.org; Fri, 27 Mar 2020 14:15:39 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40554) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jHtUB-00021B-B3 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jHtU8-0000w3-W9 for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:38 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:40097) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jHtU8-0000uK-QE for qemu-devel@nongnu.org; Fri, 27 Mar 2020 14:13:36 -0400 Received: by mail-wr1-x434.google.com with SMTP id u10so12542776wro.7 for ; Fri, 27 Mar 2020 11:13:35 -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=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=Jg3uVjPQioMHN9QODuTGcSLff1gZdlGv2bXwosnMObIDMnE2K6TvKV0ndwYd9eXA+2 iyySRgoxIeeRxuOFCRQSjZ4uouCyp/5gKF2KN3obQjj+99xT3wBUvbvxxTvQGQxHkZfs gzPkSTyfCMkpTbsOZqGMft+9ZaLlPJJg135gUusAzzVHPN9Drqw1IVg73stmG3ETrWiK fZtkAh78fPbnjWujptvLe1wlR+qNCfyH9a058edHDnkhnKdaLj6JCUdEvtdmXMmLZE1e OPwyMuSwQZHpvZBm+3mtSgs1OYPojyZudFelpk1vT7Jx9gayUZQwh0XM78gdi0dAJlIm JeMg== 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=fDYf/1zmgKNKjKhgfcohx9pQW+K3uRqOoa+dvB2+KwU=; b=YdQFO7mIa8KxSc/KX/GPesr2Z3zvt47d303Bbak19r0HLaZITbnsxuSPUDuwhUQ9Nd smBssxfxGy4cw8fN8E12WFkRqmmpNTSlNKoMXfCA04AedXoBQ5a++9Temew/z3RYmIbN mfK+FM7CTLJP+WpxSRjhSux49GxOC73F874bqxIyh7oeRrwoTmF7o3PfsKMCdBQHvBYI paDY43d6nivkB99D7H3J7WISUTQQnjx9QfYaJss1NdOwUo9DNMbqZ1xk5h1x0IDKuYIm tUToXrrW7ZS2SSrl8hELiN/KcIFP5M6VcqbwF5VmMYdz29LXXT2Yl4WzMAt7c3TbqcRi /ggg== X-Gm-Message-State: ANhLgQ3bsaAmKj385hG7xAXsl0VUQcpoHTZFi2xgl3slq/LyRaA9HDsc k3YeUxKJBCOoF5Q4KJS7VnvfeA== X-Received: by 2002:a5d:4984:: with SMTP id r4mr677442wrq.121.1585332815028; Fri, 27 Mar 2020 11:13:35 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id w7sm9257528wrr.60.2020.03.27.11.13.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Mar 2020 11:13:28 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 061041FF96; Fri, 27 Mar 2020 18:13:21 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v2 08/12] tests/docker: Keep package list sorted Date: Fri, 27 Mar 2020 18:13:16 +0000 Message-Id: <20200327181320.23329-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200327181320.23329-1-alex.bennee@linaro.org> References: <20200327181320.23329-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 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?Alex_Benn=C3=A9e?= , Richard Henderson , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Keep package list sorted, this eases rebase/cherry-pick. Fixes: 3a6784813 Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20200322120104.21267-2-philmd@redhat.com> Message-Id: <20200323161514.23952-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index cdd72de7ebf..9a2a2e515d7 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -2,6 +2,8 @@ FROM centos:7 RUN yum install -y epel-release centos-release-xen-48 RUN yum -y update + +# Please keep this list sorted alphabetically ENV PACKAGES \ bison \ bzip2 \ @@ -19,6 +21,7 @@ ENV PACKAGES \ libepoxy-devel \ libfdt-devel \ librdmacm-devel \ + libzstd-devel \ lzo-devel \ make \ mesa-libEGL-devel \ @@ -33,7 +36,6 @@ ENV PACKAGES \ tar \ vte-devel \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel RUN yum install -y $PACKAGES RUN rpm -q $PACKAGES | sort > /packages.txt diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index a6522228c02..019eb12dcb1 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,4 +1,6 @@ FROM fedora:30 + +# Please keep this list sorted alphabetically ENV PACKAGES \ bc \ bison \ @@ -38,6 +40,7 @@ ENV PACKAGES \ libubsan \ libusbx-devel \ libxml2-devel \ + libzstd-devel \ llvm \ lzo-devel \ make \ @@ -92,8 +95,7 @@ ENV PACKAGES \ vte291-devel \ which \ xen-devel \ - zlib-devel \ - libzstd-devel + zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3 RUN dnf install -y $PACKAGES