From nobody Mon May 6 03:56:06 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606326725; cv=none; d=zohomail.com; s=zohoarc; b=XlSz8+NhzP3AW0qZi2Z74cbOXexa91Q4lceCUihN+jGhCnHS9nzfNbFGg7yBdB1cN6ZI0uWEby3NSMnMTBKH74G1S0IyArdQVLl8/MmqM5ayMmAh/r9spr379tOEdvd7sLA8neTDYHw05Rj5LIjfu4tJfFB7tZfx0ywFZE2Rf4k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606326725; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=d/As/AETJucgYH9GF0LOf7l7c+kNbYwYTuHxhzbxtKOWHd8BMU1dvStbIncs4dI/DcWmtvw+UZIbzQPIBa0udp1Zjtjpp3DGtV4t+Y3ttGo2mx2K5Kv2fTowV6NkFCs92f/Jbp3ziOZnFlwH25bsS16orizNrdBt6szh/u0za00= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1606326725989961.6781393738656; Wed, 25 Nov 2020 09:52:05 -0800 (PST) Received: from localhost ([::1]:59346 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1khyxY-0006TG-Dx for importer@patchew.org; Wed, 25 Nov 2020 12:52:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53204) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1khywV-0005WH-TN for qemu-devel@nongnu.org; Wed, 25 Nov 2020 12:50:59 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:35974) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1khywT-0004qO-LB for qemu-devel@nongnu.org; Wed, 25 Nov 2020 12:50:59 -0500 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-357-y-8SPD9LPFSPGFX9YsRvew-1; Wed, 25 Nov 2020 12:50:52 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D809C9A257 for ; Wed, 25 Nov 2020 17:50:51 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 86F8810023BA; Wed, 25 Nov 2020 17:50:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606326656; 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; bh=XoLew6fCJvQ4C8y1gmDHrdDLwCAMji/JWWXDSHwIdec=; b=BfA2Bf3Y5LEal0OugeXZvE3/mqdK8cQcBO2d2JTz83jiVlQsAQGFXARLjT62Q1fjP/Jzh0 Wyh4FDwN4ufN+1PggwYU8ZjnQUmWFIGigfmjuCci6FWDE8D84dZ24ymXzHY7B1/esKkyKa 2sd22blla5KVUF4c45xIPA1jf3wXCvQ= X-MC-Unique: y-8SPD9LPFSPGFX9YsRvew-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH] tests/docker, tests/vm: remove setuptools from images Date: Wed, 25 Nov 2020 12:50:51 -0500 Message-Id: <20201125175051.3051129-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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: Thomas Huth Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Setuptools is not needed anymore by the bundled copy of meson, remove it. Suggested-by: Thomas Huth Signed-off-by: Paolo Bonzini Reviewed-by: Thomas Huth --- .cirrus.yml | 1 - tests/docker/dockerfiles/debian10.docker | 1 - tests/docker/dockerfiles/fedora-win32-cross.docker | 1 - tests/docker/dockerfiles/fedora-win64-cross.docker | 1 - tests/vm/freebsd | 1 - tests/vm/haiku.x86_64 | 1 - tests/vm/netbsd | 1 - tests/vm/openbsd | 1 - 8 files changed, 8 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index f0209b7a3e..2e45b3254f 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -85,7 +85,6 @@ windows_msys2_task: C:\tools\msys64\usr\bin\bash.exe -lc "pacman --noconfirm -S --need= ed \ diffutils git grep make pkg-config sed \ mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-setuptools \ mingw-w64-x86_64-toolchain \ mingw-w64-x86_64-SDL2 \ mingw-w64-x86_64-SDL2_image \ diff --git a/tests/docker/dockerfiles/debian10.docker b/tests/docker/docker= files/debian10.docker index 21cc671d71..73a3caac9c 100644 --- a/tests/docker/dockerfiles/debian10.docker +++ b/tests/docker/dockerfiles/debian10.docker @@ -30,7 +30,6 @@ RUN apt update && \ pkg-config \ psmisc \ python3 \ - python3-setuptools \ python3-sphinx \ $(apt-get -s build-dep qemu | egrep ^Inst | fgrep '[all]' | cut -d= \ -f2) =20 diff --git a/tests/docker/dockerfiles/fedora-win32-cross.docker b/tests/doc= ker/dockerfiles/fedora-win32-cross.docker index 5903e1b0b4..087df598a0 100644 --- a/tests/docker/dockerfiles/fedora-win32-cross.docker +++ b/tests/docker/dockerfiles/fedora-win32-cross.docker @@ -30,7 +30,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index 7f03cd8ffc..d5d2f5f00d 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -26,7 +26,6 @@ ENV PACKAGES \ perl-Test-Harness \ python3 \ python3-PyYAML \ - python3-setuptools \ tar \ which =20 diff --git a/tests/vm/freebsd b/tests/vm/freebsd index 04ee793381..09f3ee6cb8 100755 --- a/tests/vm/freebsd +++ b/tests/vm/freebsd @@ -33,7 +33,6 @@ class FreeBSDVM(basevm.BaseVM): "pkgconf", "bzip2", "python37", - "py37-setuptools", "ninja", =20 # gnu tools diff --git a/tests/vm/haiku.x86_64 b/tests/vm/haiku.x86_64 index 37af48bf1b..2eb736dae1 100755 --- a/tests/vm/haiku.x86_64 +++ b/tests/vm/haiku.x86_64 @@ -77,7 +77,6 @@ class HaikuVM(basevm.BaseVM): "devel:libusb_1.0", "devel:libz", "ninja", - "setuptools_python3" ] =20 # https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (re= versed order) diff --git a/tests/vm/netbsd b/tests/vm/netbsd index 596717cc76..b9efc269d2 100755 --- a/tests/vm/netbsd +++ b/tests/vm/netbsd @@ -31,7 +31,6 @@ class NetBSDVM(basevm.BaseVM): "pkgconf", "xz", "python37", - "py37-setuptools", "ninja-build", =20 # gnu tools diff --git a/tests/vm/openbsd b/tests/vm/openbsd index 386b2c72f7..4d1399378e 100755 --- a/tests/vm/openbsd +++ b/tests/vm/openbsd @@ -30,7 +30,6 @@ class OpenBSDVM(basevm.BaseVM): "git", "pkgconf", "bzip2", "xz", - "py3-setuptools", "ninja", =20 # gnu tools --=20 2.26.2