From patchwork Wed Mar 25 15:15:39 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: 184812 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp733600ile; Wed, 25 Mar 2020 08:19:45 -0700 (PDT) X-Google-Smtp-Source: ADFU+vvLyetwvWuVKzR9pQmJEdeVDfKCVClWZmg+yvpVTTuFVS0kRxAHl5hYdsw06zu5p0mFl0JT X-Received: by 2002:aed:38ea:: with SMTP id k97mr3413096qte.327.1585149585568; Wed, 25 Mar 2020 08:19:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585149585; cv=none; d=google.com; s=arc-20160816; b=d2SfmNwhdawdsT1CtKxxC1/XJ0RV29DZaTxFvGX85uYtAKgaqZNbaWpQKa8NdldFnV 8tNM4NrIFR+8WIWy1D9yE/8b6KJoo6zaozTmHczzEAKv4RtBTr84uivLWnVP7F8XpfHc 9zYDPXekFyLYui0aPViEAfYRXUZ+hKDbq3zeONDsnOMQJqaEoRmXHUEMhzJvyWwdPlG/ 0Zm6zP5p0ZiGIbzOrBAgUSbP/AqZOrxfGizZpR2n9H21quDlfQhFNMWYvTZJ9h53f5xa P/1016AqysEUDkV8BVh1qHiUqCXeHjF0SialbfuKrGmMVg8Sl2ZEifNAMqa/nKH4CCbC 2jGA== 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=W26aWDUMaRnlQG2aWVdea+sNsYXPJTWBNPNgUhzqXowcDI+fYYZRpYSfKMQnd/Jw/4 Rex2kSGRlUf+YAlgNouCDSYi9Z6Db3uivodCFCmNf3CrLPUCOOHHQOMmq/oYyhFBjgGI rnee3rxKS6gbmvP4QuNnOUii+H0hvGKABUEiVeN/g2qmuDNIS5ms/M0GOplBszbVLVID rFnw1JtlB1C0vhbEwAPZWCUvlBCU64rpNhAZCKTA7HeTteXBJNW3xZkdkruMU/1RkSga Paqy8xbMJBqoYEYhu9/uOpSWcqgtyyzEktam5Jb98Zb010TcJ14XXoT5rJjEzePJOfV6 pEXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ap3g89TW; 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 s19si12990697qth.161.2020.03.25.08.19.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Mar 2020 08:19:45 -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=ap3g89TW; 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]:38052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7on-0001xS-0B for patch@linaro.org; Wed, 25 Mar 2020 11:19:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41593) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jH7lD-0003tD-03 for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jH7l8-00084S-0W for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:16:02 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:34182) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jH7l7-00082u-QQ for qemu-devel@nongnu.org; Wed, 25 Mar 2020 11:15:57 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 26so5175977wmk.1 for ; Wed, 25 Mar 2020 08:15:57 -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=ap3g89TW5oitenk2RhM1bRY3+t+rXXQJ78jp01F0wjpcIrJSMgDTHlE01xr7rAMv+s 0xs/tgYhtosn4JdgSikpVAWwslr7DaENMfN6CSus5iuIhs7PIqYwXuIr3DSZeft65me4 u0uN28dxwn1cKZVawx2UTPqz/4FuGTq3jHDq7n61tcbO4y6vGWnCkDzWCUN+g33os+wN +aAWsU5DW56i9bMuJEc+UK0X8MuLm+3Smabypmi4Umu2SsTWE6Z5rcSbH/3JPJZijWZR GcnuC1wGK8aI2DI1TvFEiJtLSMylJyvkNTjWEBkdYgBdTy4yS2gnSPo8XiD+CHeaiHZS PfGA== 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=na52ryuIViZ4XxFs5W+ywOjGeU05UEOMssrZURT4gk7lrgvjyPFGR0Ah51Z3iZYARN 6CaFP6+kI+zYg1TD96vSlBdRhEEs+UPoyZIVuJOc7UKM1XrhCu3TKDivUz3XSLsXAENZ yoFBVQ8Wygmzy0HT4//nZxmLqnds0aigkXS1XdrILNPcc0qepOhlwUxCDyu4ezUYLxt+ OkJaR2s0OvEFP7Scw64FIkqEcFfLqpSccqCKCH4TFEQMmqV455LyC0KFLP8IVpdhCYUv zoATmtd7/HkPScw31I0lzxoXuWAz0dRXb89FVO2Z0CxtZ6OSKlywhNCKaPsSCqkhra0E uxwg== X-Gm-Message-State: ANhLgQ0Eo0zRVxqW4Q/80H4gF50ja8s8TA4lna+W+5ySSLLD9zqrgaeh xbSf3BqipvpV0JErFSbb4PHIzERj+HE= X-Received: by 2002:a1c:b657:: with SMTP id g84mr3910303wmf.107.1585149356801; Wed, 25 Mar 2020 08:15:56 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id u16sm34744270wro.23.2020.03.25.08.15.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2020 08:15:52 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E03241FF93; Wed, 25 Mar 2020 15:15:43 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 07/11] tests/docker: Keep package list sorted Date: Wed, 25 Mar 2020 15:15:39 +0000 Message-Id: <20200325151543.32478-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200325151543.32478-1-alex.bennee@linaro.org> References: <20200325151543.32478-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::32d 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