From patchwork Mon Jul 12 12:26:27 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: 473121 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2934968jao; Mon, 12 Jul 2021 06:19:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYO/DUzI81kecXQhnkv6h7tADkh8MwvFwviq0NFTmjba/hrI774Wih8BBLiTbA67ELsfIF X-Received: by 2002:adf:fdc2:: with SMTP id i2mr35283563wrs.157.1626095984879; Mon, 12 Jul 2021 06:19:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626095984; cv=none; d=google.com; s=arc-20160816; b=ZL1R8A9OYcyzjcEeP2SQNxqFj2u81qTv/XKK643y4mSYs8a7X9sut9hpauCbZiKxJe uREdVBhW8l5zS8xI5R+AqzhrAyJyiBGNTPQNciCcK74CcWc3StsQChbymAKv7H4jaS0B TNWT2KK78HoqYhQQKtL04HeqsfRYdmMYtjxd/hljMyMzfvmxoRba+3QV3Q3zNP3d1x6w 2BSXfJiHfZWhP7H83VBOlyKCm6CSdezFUGkPzyCnD+NKy5FY8f4xnxrrcLSVcjg007Jv 8JrvoClzqkbPRpBcWPH22uDVWvp7SxApUBOMVeov62XX+dhijnbZ2Y4Kig9ea2/8HE2z mOQA== 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=IKyCfwfPJOUv0jDI6v0sPyH6wu+UFAIsGLs4y1BwZ5jXkkgQiDrq4kK9z1gyiGoUXi Vn17SMJoNiXzRqgKgwwVfGCVyMf6krX5rvoDO1rwSU2Me/E+tuAQ1XOfHdap1UtZp5sP MKxfmqP1nDZk14UI5gLTJLKoaMcEj9oQw6DTXi/oG5tN63uNT4Qn3ATNYpp6ZqU2QgoK 0aWNioRkon8yyRj349VNGXTMrx0wnPQxdPU1tZMzbqC3doniKRstSRoVhgIC0NJq4VLx n7EVqPEgCjoZ6Vny1HHxa1TiS644OdIz0DbKUh/1Vt3aOi4EheDqZs6dL5ijEOkHK6x5 2YDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gaWzAosz; 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 y3si21516910wrh.171.2021.07.12.06.19.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Jul 2021 06:19:44 -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=gaWzAosz; 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]:57460 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m2vqZ-0008A8-Oo for patch@linaro.org; Mon, 12 Jul 2021 09:19:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42972) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m2vGw-0007H8-Hf for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:42592) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m2vGu-0006FE-OF for qemu-devel@nongnu.org; Mon, 12 Jul 2021 08:42:54 -0400 Received: by mail-wr1-x434.google.com with SMTP id r11so20161338wro.9 for ; Mon, 12 Jul 2021 05:42:52 -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=gaWzAosz4396SjvK/SyAkrH2ekQLjYru8h/92oE2dgpKDak92LAF6Ek5yi1tkNvWQK UADJ3YNdqZouosLouLmRwyWk7v9dPL092wQ1a70fZHvGAjZTqdqZlmmZTzsVcXF42Ui2 NUa6Q7K4zezw0HLWFVX+mbhvg6akIImkgqhEATwtRBInx0s9U6Or8UDedFO5iBbd/U8F QNgqBOsXAOjQ4e1HGJmnf93FZnAFMhgJVbo/7Y6EzFMU1Mo5P8XklVF7xveOWsBGjNbW +iFWgz2re/51dZ40rKJ+RLfBB0VwvN0nIH7r/1R7B0EG07/lbbkpPJZ4BevKiKbw6tf9 v38g== 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=VaPhVKL/PzIIl5kE+pKOxsFNIQvomYyTqCWwCvTb+3St+4JQxT5PW0gwTPHrJOi6/V HB37N6uDkMFOd2odUMeCJueHGU+AWeezwWvq96+CKZVEJh2nWNdR3Pn/7zj96KBMomSX M5NvVVpYYS0/M4uA7i/xaQ6paUXx6/EErlJMS5bQEsYgVYaV0N/yhxf3GgFZcEu/sOK6 EY+1/H7bbBWMVRLkET5l/3/prbBQ1iQYUkB7aAHvBPcoVs7TbcM6zxacIXSYouC2D7H1 2/fe1Uiq38l96ZtGKrGaCuAqup8aZJYFEDIySg7aqMENDDIaN7hhoQH2gGdYXfq2khTh nXaQ== X-Gm-Message-State: AOAM530xXJ76VEPgh6r2JSLFC2GmIyBb5yVuVzeq5BxJEzDQJHTn/Ih9 PX5DLQ0jop5Ky0QjZiPqASUrUg== X-Received: by 2002:a5d:64aa:: with SMTP id m10mr9402006wrp.351.1626093771240; Mon, 12 Jul 2021 05:42:51 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id v11sm14016963wrs.4.2021.07.12.05.42.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 05:42:49 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7709B1FF9D; Mon, 12 Jul 2021 13:26:55 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 14/40] tests/docker: fix sorting in package lists Date: Mon, 12 Jul 2021 13:26:27 +0100 Message-Id: <20210712122653.11354-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210712122653.11354-1-alex.bennee@linaro.org> References: <20210712122653.11354-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::434; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x434.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