From patchwork Wed Jul 14 15:00:08 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: 476810 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp676802jao; Wed, 14 Jul 2021 08:31:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyam87cgaPDbdEicnHhtjxb/4Swq9dz7Pga0AhMDixqCj2fmVcgTHUX8Ki4aUDrdZN1jjI X-Received: by 2002:a05:6512:691:: with SMTP id t17mr8258181lfe.526.1626276690534; Wed, 14 Jul 2021 08:31:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626276690; cv=none; d=google.com; s=arc-20160816; b=Jeco3cc6DyZIWjuJFaiNB1FGmZje1Y0hxVDSBmV6KGuqMVp82G/lLtRen7ttG5EVmC iHPnioPtLmIHXi1V/Snc+dugFoSyWGyK1OFBhOQuND4HHb0I0Fwo+6YbROAvIIpV9jQs E6NKMSjyPMV68SP54ILNsE5M6kVFyU7Z0+JI5nwYco5ypgI6Ycq/L0xrVUsZbNdLp086 YhEicQz1VEblYyeNJELo8UJWbaWsxOqZIaZbbinSu1sphn6AgCfYYcOUFRO2hYOX7HLv k85GbBqA9e86pmrgVQQ0JWvu0a2i9eEgyaZThhjJXCvDIGhbSie1MEJGI9HXIO+D/vVQ vmMw== 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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=W7Jbl8SAOdLf1ZDNQ9X2KanKwEbHddgcUBawfO9y/x4+GdO1jy8l0EDKfKyLcKKUm2 1TRK8rQqp9yTBQgxvWhwCCS0OJkiy6uZkK9ii1APbTGa020yMttzLCQUC2MHmuLftN/g PveHtfemElW35SwLzDhLxdFlGgRUPjCbqsQ8G6rLpwaRUU8NtIjnmnAI+9cpCOwX1XIw y/FREflauxGp+XFJvujfhl1nbL2AgBH1w6LZxGKH5EtJFGLxUunvQ6DD0YKI1Lv5/pvR CGHrqcTKO+55G95+MUmWfuFg8WYuNMNjJobyQfSMAStmdgfRMpMAP4RJzLVqD8IRLwg9 ucug== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SnVuM2tT; 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 h12si4833638ljj.187.2021.07.14.08.31.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:31:30 -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=SnVuM2tT; 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]:35306 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3grB-0000jp-7O for patch@linaro.org; Wed, 14 Jul 2021 11:31:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53402) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3geO-0004we-DP for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:20 -0400 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]:45642) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3geL-0002H3-F9 for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:18:16 -0400 Received: by mail-wr1-x42f.google.com with SMTP id t5so3653547wrw.12 for ; Wed, 14 Jul 2021 08:18:10 -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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=SnVuM2tTOoKZl7/8ta0gSp2nA47BqMNLYBL/adjGYTz8k0EpSRZ2/5BPvZOyeMb/ay 1PcSUZg/i72VqRcfkqJur5D/ptE9SzKHMkgHe/IRU3uMsPtVvCbAzVdjDpr1xh/5PaYI 2XTI892QmrMj/dba0xd69O/ibZeYziOR91+hoaXj0BDLjlawz2QtLFhrupOmWlMbO5/N ALXGCiLOfEYR/8CScxWeblPY8D5rN7HzeBYbdQqO6jnZkLiZKHF0nUts8qCrVsdVaw1t EaaTWdItLkExSzyU3UGqJLBVmua/Jnpxut/U6yTgOiGKB0buyL/OPsV7pGAuzjfYQ/U3 yNZg== 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=NeABLV7StpNg0vKloEwYcA5/N3mgXlUJz7t9QWy+kVI=; b=JtFxGiTMJlBpdFFSXExL2vNUimLZwS1plw/c4k70NxfCCbP48bFUiHeivkXObgn1dT xS0HPJZfZIBfPX2EMjgRMfdsiqTBBiaOWJkSxUI6gYbh31PDPcgALVR7BQowY7chJueo 112BHIt3K9Aqd4+r6gDe1W/v11GKm65327zWZa63eIdz8oMS82Y7P6YUFTAQWJovreJP 6P+35QznGnqMdi9OFaoc1wNDvlsViJe6uwEzlta6PH79z+NeJJrq8r7PMSFa9iiszWwE VPawrG8q5bPng8FmfymP4gvPoDevW5ioPSN4axFWauayC/ZcB+a0lr894SeUsamB0+hh 0h7Q== X-Gm-Message-State: AOAM531nHylV+GlIFDXFs2Zry/UJd8ji+FA0Pc3vtqXB02rmSBt30JoZ SXT0k4xzGtvOeifrGbCp5hcmhQ== X-Received: by 2002:a5d:4e4e:: with SMTP id r14mr14146863wrt.251.1626275889613; Wed, 14 Jul 2021 08:18:09 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z7sm2162775wmp.34.2021.07.14.08.18.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:18:07 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A53141FF9F; Wed, 14 Jul 2021 16:00:38 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL v5 16/44] tests/docker: fix sorting in package lists Date: Wed, 14 Jul 2021 16:00:08 +0100 Message-Id: <20210714150036.21060-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42f.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: Thomas Huth , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , qemu-devel@nongnu.org, Willian Rampazzo , =?utf-8?q?Alex_Benn=C3=A9e?= 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é Signed-off-by: Alex Bennée Reviewed-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Message-Id: <20210623142245.307776-7-berrange@redhat.com> Message-Id: <20210709143005.1554-15-alex.bennee@linaro.org> -- 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