From patchwork Tue Dec 1 17:18:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Patchwork-Id: 11943381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E865C64E7B for ; Tue, 1 Dec 2020 17:26:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4C79C20757 for ; Tue, 1 Dec 2020 17:26:02 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="du4Sn7SW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C79C20757 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33812 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kk9Pd-0004dM-3Q for qemu-devel@archiver.kernel.org; Tue, 01 Dec 2020 12:26:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35868) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kk9Il-0004SE-V5 for qemu-devel@nongnu.org; Tue, 01 Dec 2020 12:18:57 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:28528) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kk9Ii-000259-6L for qemu-devel@nongnu.org; Tue, 01 Dec 2020 12:18:55 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606843131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UCTFTRTZypDcNN9I4Mq4/81YhoIsBnVvp4XLUhGJvlU=; b=du4Sn7SWhdSzz9wklVHhrniDRZAeIKv5nHhBrhJhfzmG/5kcfZc5sIoB1Avb+l+X4cklE1 bj2fP2Y0T6Cs+0mmMiW3Pzv31h2lQriMCszMqAdmDr8WQTd+yH0KUao1ZQdAnHAXnRCs+q nverNVn8zF1fLNk3xi1VixkUNOAOXpA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-273-QfC-HKxgOgiFljGKkNyYhw-1; Tue, 01 Dec 2020 12:18:50 -0500 X-MC-Unique: QfC-HKxgOgiFljGKkNyYhw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C423D858186; Tue, 1 Dec 2020 17:18:48 +0000 (UTC) Received: from fedora.redhat.com (ovpn-115-4.ams2.redhat.com [10.36.115.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 244255D9C2; Tue, 1 Dec 2020 17:18:46 +0000 (UTC) From: =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/23] tests/docker: fix mistakes in centos package lists Date: Tue, 1 Dec 2020 17:18:10 +0000 Message-Id: <20201201171825.2243775-9-berrange@redhat.com> In-Reply-To: <20201201171825.2243775-1-berrange@redhat.com> References: <20201201171825.2243775-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Received-SPF: pass client-ip=216.205.24.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, 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 Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex?= =?utf-8?q?_Benn=C3=A9e?= , =?utf-8?q?Daniel_P=2E_Be?= =?utf-8?q?rrang=C3=A9?= , Peter Maydell Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" dbus-daemon doesn't exist in centos7, it is part of dbus. snappy is used by QEMU, not csnappy. mesa-libEGL-devel is not used in QEMU at all, but mesa-libgbm-devel is. vte291-devel is required for GTK3, not vte-devel. spice-glib-devel is not use in QEMU at all, but spice-protocol is. librdmacm-devel is a virtual provides for compat, the actual package used is rdma-core-devel. There is no need to specifically refer to python36, we can just use python3 as in other distros. Signed-off-by: Daniel P. Berrangé --- tests/docker/dockerfiles/centos7.docker | 11 +++++------ tests/docker/dockerfiles/centos8.docker | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/tests/docker/dockerfiles/centos7.docker b/tests/docker/dockerfiles/centos7.docker index 4372e200d7..f3ef2cf8d8 100644 --- a/tests/docker/dockerfiles/centos7.docker +++ b/tests/docker/dockerfiles/centos7.docker @@ -9,8 +9,7 @@ ENV PACKAGES \ bzip2 \ bzip2-devel \ ccache \ - csnappy-devel \ - dbus-daemon \ + dbus \ gcc \ gcc-c++ \ gettext \ @@ -22,21 +21,21 @@ ENV PACKAGES \ libepoxy-devel \ libfdt-devel \ libgcrypt-devel \ - librdmacm-devel \ libzstd-devel \ lzo-devel \ make \ - mesa-libEGL-devel \ mesa-libgbm-devel \ nettle-devel \ ninja-build \ perl-Test-Harness \ pixman-devel \ python3 \ - spice-glib-devel \ + rdma-core-devel \ + snappy-devel \ + spice-protocol \ spice-server-devel \ tar \ - vte-devel \ + vte291-devel \ xen-devel \ zlib-devel RUN yum install -y $PACKAGES diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerfiles/centos8.docker index 9560bb06e2..1d10b8c263 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -18,16 +18,16 @@ ENV PACKAGES \ libgcrypt-devel \ lzo-devel \ make \ - mesa-libEGL-devel \ - nmap-ncat \ + mesa-libgbm-devel \ nettle-devel \ ninja-build \ + nmap-ncat \ perl-Test-Harness \ pixman-devel \ - python36 \ + python3 \ rdma-core-devel \ - spice-glib-devel \ - spice-server \ + spice-protocol \ + spice-server-devel \ tar \ zlib-devel