From patchwork Thu Jul 8 19:09:16 2021 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: 471334 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp606008jao; Thu, 8 Jul 2021 12:59:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybXeMV30I+rThlc50V0B0O2jolflTmegTnkMofq65+RD3W1ej2RaUATcMSWxHI7xayIPnn X-Received: by 2002:a05:6638:3382:: with SMTP id h2mr2400817jav.131.1625774387128; Thu, 08 Jul 2021 12:59:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625774387; cv=none; d=google.com; s=arc-20160816; b=OjzrOiPT/db4kxcgprf4UsSu6hKDHcDzvwbumfdcM1Z8POHVqVK8IniWa5EJLrYkk2 t/OtZdA8nCfaCt8Up/r6qmzPGNvIGY8lATja9Etg/ED11f/QcLMDOhSARcX309svAZKU m+k3qrpXdippgd1vFkqW5p/VjrHkpQI5wprvqMgD/JL2XfRjtRW3+/NlCqz3XcKO6w3o uoQ/fiuhTk6VsWbros3+vsvVLHWim0zuQbBQtLTaqROpzEfWK0UM91dGEHAdWRd+RvCh Wdwm2CF//qYAeJeAQ0vqzP2YVMPzKS7zy6cm6yK2VDyKEWaYD5mUZZhGtDsZf1iIkWs2 +f2g== 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=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=aOCe/9lIHgUg+EAEkmTaTKY4cZKp9mYEbPyVSBJ+DOXp2cxvs5+P2wfI6yznA1FX+h T97QjQ66nfcS/4k2W2DRryhsW57aCTKoDrbCM4OTRdeQwKTfOzuPOUkPFNX/eZWErA0x iuDwxzRICr//uzzX79M9hLoa8jV3+ZYvMazwwYJfMIJZlCW4arg3AwPpGUr7GVQoRMFR +qcckc8ieZ3IBt3TmCaU4F96ywvPKwMoB8SkQAPOrmfm6Lmb0SL+JhO1qSLY0QtXuaNX DHFQHWsMRuNkb6R94Ek/5TRqeRfKuNn2B6Mxtad73imUr8QsXjPVIfN9esR/VNjMC0Jt +uqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=WGKwUuWc; 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 s11si3735776jat.44.2021.07.08.12.59.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 08 Jul 2021 12:59:46 -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=WGKwUuWc; 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]:39882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m1aBV-00089A-Ez for patch@linaro.org; Thu, 08 Jul 2021 15:59:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51756) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m1ZWb-0002ce-O2 for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:29 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:56189) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m1ZWZ-0007Xk-LY for qemu-devel@nongnu.org; Thu, 08 Jul 2021 15:17:29 -0400 Received: by mail-wm1-x32d.google.com with SMTP id j34so4761401wms.5 for ; Thu, 08 Jul 2021 12:17:27 -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=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=WGKwUuWcXTrLehDA0jKDg9EtLzNufgHuQ0U+GBAw9MdtxaYgOO4FXWvYseSLF+xc9T MxK2dy3fpEg6AvkSbibA69tE6wTw5xhdc58DDFnp0HBBXwuGCEPdq/S+iYEjkr0TM8Zf WiTr6jCu+9Tk9x8a3OI9H7681c6tYdOM8scrmNiloJMpeairhMKQQxtM7u8ThUplIWhJ VdTiN/lmKQq/v3nz3+YVYuTi7II1CbSxz9zDH1DjaoOf0B0DFngwgYHllvE/pmgspW/T b4BHjW1gNi1MkAbjP4Cp/9A0G38WvLmZBb1DlqjjLpM1xw8vBJK88GDJAgcSy0dEPd7C iv8A== 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=CFyLbsCarDbcc8xVrNzNM3GtcCMt9zLW6sDCVFExxAQ=; b=Y6/WS2ietKGznE6QQaS3Hp7Oq34MiQIiketuSZgcdKWHkE6Z6cZOfzARhzpM8ApC32 8NU0iehAToLwZqNF5XQd5mrYE8BFhuVr8PjZ6FupHxs8m69nN3dbZn3k/dR4VIcQnHzM zdnJ5mDNnInQCtlC6KcYL/5iS6TkGIOWaIsE+3/JoJpjX8yqt7iYVuCUrYdSIHJDFGNy r4tvE96EO2GKH3BbhCuhJYkdlBtiWMwnAHC0kzKbNl7dX50ejr+5kQBqUWl1EBPT3dYc C9mNqTEORRnV56H3iHnDa4FuWBwubBfQnMLQl6myTyH/upEgqhHJsY71eWjur0iD47rc PZAA== X-Gm-Message-State: AOAM532zUec6ylkh0Jr+OsHyl8/2hckDkKF4C1L2WGXs3cZMFmhL9feI fkiEgP4NHJN6vCbSTXJQDW3nQg== X-Received: by 2002:a1c:ed0a:: with SMTP id l10mr35059439wmh.151.1625771846429; Thu, 08 Jul 2021 12:17:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id l13sm3119996wrz.34.2021.07.08.12.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Jul 2021 12:17:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A8F7F1FF9C; Thu, 8 Jul 2021 20:09:43 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 14/39] tests/docker: fix sorting in package lists Date: Thu, 8 Jul 2021 20:09:16 +0100 Message-Id: <20210708190941.16980-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210708190941.16980-1-alex.bennee@linaro.org> References: <20210708190941.16980-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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@euphon.net, Thomas Huth , minyihh@uci.edu, berrange@redhat.com, kuhn.chenqun@huawei.com, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , f4bug@amsat.org, robhenry@microsoft.com, Willian Rampazzo , mahmoudabdalghany@outlook.com, aaron@os.amperecomputing.com, cota@braap.org, Wainer dos Santos Moschetta , stefanha@redhat.com, crosa@redhat.com, pbonzini@redhat.com, ma.mandourr@gmail.com, =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Daniel P. Berrangé This will make diffs in later patches clearer. Signed-off-by: Daniel P. Berrangé Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-7-berrange@redhat.com> Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/centos8.docker | 2 +- tests/docker/dockerfiles/fedora.docker | 4 ++-- tests/docker/dockerfiles/opensuse-leap.docker | 16 ++++++++-------- tests/docker/dockerfiles/ubuntu1804.docker | 4 ++-- tests/docker/dockerfiles/ubuntu2004.docker | 8 +++++--- 5 files changed, 18 insertions(+), 16 deletions(-) -- 2.20.1 diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 8f810810f3..ee52305646 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -22,9 +22,9 @@ ENV PACKAGES \ lzo-devel \ make \ mesa-libEGL-devel \ - nmap-ncat \ nettle-devel \ ninja-build \ + nmap-ncat \ perl-Test-Harness \ pixman-devel \ python36 \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 64a413f5e0..4a0a84eb43 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -2,6 +2,7 @@ FROM registry.fedoraproject.org/fedora:33 # Please keep this list sorted alphabetically ENV PACKAGES \ + SDL2-devel \ bc \ brlapi-devel \ bzip2 \ @@ -79,10 +80,10 @@ ENV PACKAGES \ mingw64-pixman \ mingw64-pkg-config \ mingw64-SDL2 \ - nmap-ncat \ ncurses-devel \ nettle-devel \ ninja-build \ + nmap-ncat \ numactl-devel \ perl \ perl-Test-Harness \ @@ -97,7 +98,6 @@ ENV PACKAGES \ python3-sphinx_rtd_theme \ python3-virtualenv \ rdma-core-devel \ - SDL2-devel \ snappy-devel \ sparse \ spice-server-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/dockerfiles/opensuse-leap.docker index 7ebff1b3a8..6011447181 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -9,46 +9,46 @@ ENV PACKAGES \ cyrus-sasl-devel \ gcc \ gcc-c++ \ - mkisofs \ gettext-runtime \ git \ glib2-devel \ glusterfs-devel \ - libgnutls-devel \ gtk3-devel \ + libSDL2-devel \ + libSDL2_image-devel \ libaio-devel \ libattr-devel \ libcap-ng-devel \ libepoxy-devel \ libfdt-devel \ + libgnutls-devel \ libiscsi-devel \ libjpeg8-devel \ + libnuma-devel \ + libpixman-1-0-devel \ libpmem-devel \ libpng16-devel \ librbd-devel \ libseccomp-devel \ + libspice-server-devel \ libssh-devel \ lzo-devel \ make \ - libSDL2_image-devel \ + mkisofs \ ncurses-devel \ ninja \ - libnuma-devel \ perl \ - libpixman-1-0-devel \ python3-base \ python3-virtualenv \ rdma-core-devel \ - libSDL2-devel \ snappy-devel \ - libspice-server-devel \ systemd-devel \ systemtap-sdt-devel \ tar \ usbredir-devel \ virglrenderer-devel \ - xen-devel \ vte-devel \ + xen-devel \ zlib-devel ENV QEMU_CONFIGURE_OPTS --python=/usr/bin/python3.6 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dockerfiles/ubuntu1804.docker index 0acdb0d9ad..a50a35e6fe 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -46,10 +46,10 @@ ENV PACKAGES \ libxen-dev \ libzstd-dev \ make \ - python3-yaml \ + ninja-build \ python3-sphinx \ python3-sphinx-rtd-theme \ - ninja-build \ + python3-yaml \ sparse \ xfslibs-dev RUN apt-get update && \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dockerfiles/ubuntu2004.docker index 88b3cfa136..eee2ef3cac 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,8 +1,10 @@ FROM docker.io/library/ubuntu:20.04 -ENV PACKAGES flex bison \ +ENV PACKAGES \ + bison \ bsdmainutils \ ccache \ clang-10\ + flex \ gcc \ gcovr \ genisoimage \ @@ -65,8 +67,8 @@ ENV PACKAGES flex bison \ sparse \ tesseract-ocr \ tesseract-ocr-eng \ - xfslibs-dev\ - vim + vim \ + xfslibs-dev RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y install $PACKAGES RUN dpkg -l $PACKAGES | sort > /packages.txt