From nobody Mon Nov 25 09:27:45 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=1715595842; cv=none; d=zohomail.com; s=zohoarc; b=G0jbBuOoowRUY5gqj58/yM957CDWmwTzxNx+oglt+ALrG1LwLVgzcjsP1J3YdFEvO6+BGZoBJPeOxM3nMvalfReNTTyJ7/MzCAEnkZRQPbzKyjtaN8qGfJLaN3wwNBfJ8wgzo935id1gMlOfeaUKL1hC4A/KLb6tduzV6NeCgKc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715595842; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=xZzxxedEbfJGb19n2QRpwGsMhnAuycLrE0tba6VagJc=; b=B+m4EDT5e6TJ/5SokmlBhnprFoH90yrBTnpE/dhjVcBoEG57UAHYSRLZ4AQn/SOMqAQiZjmv3I2jH/vrNUwHOiFxPILHFjOwQJuiDT25UKpbjkxTnlKDlRWG2TKxAm8ApFXpOJ1NPVHesFGSb37FiuaoKGQt9Gb75jJrGD/pe9k= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715595842876388.619471580536; Mon, 13 May 2024 03:24:02 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Sq5-0004Us-5m; Mon, 13 May 2024 06:23:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Sq3-0004UU-2G for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:23 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Sq1-0008Rt-Kf for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:22 -0400 Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-GkAzbH9VNS2hQo7mlAeTxQ-1; Mon, 13 May 2024 06:23:07 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6DC8D3813BC8; Mon, 13 May 2024 10:23:07 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8142740C6CB6; Mon, 13 May 2024 10:23:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715595801; 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=xZzxxedEbfJGb19n2QRpwGsMhnAuycLrE0tba6VagJc=; b=cCI4BE7HQ/muLXiG5l1ix3Ex2zuooELjyUDMAQ041IJx7rlESgFk6ox/7xPZYNcP8+7aY5 SgjxGdawd+1pywRiFqigbRyXWSX/P3v1UnRrZY0SSPnya/SdweI6yWXpboowuTXEH3Nj3C gayD2LAh0kLzJv7ER3GrDLqO0qojtPM= X-MC-Unique: GkAzbH9VNS2hQo7mlAeTxQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH 1/4] tests/lcitool: Remove 'xfsprogs' from QEMU Date: Mon, 13 May 2024 12:22:49 +0200 Message-ID: <20240513102252.48884-2-thuth@redhat.com> In-Reply-To: <20240513102252.48884-1-thuth@redhat.com> References: <20240513102252.48884-1-thuth@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715595843676100001 From: Philippe Mathieu-Daud=C3=A9 QEMU's commit a5730b8bd3 ("block/file-posix: Simplify the XFS_IOC_DIOINFO handling") removed the need for the 'xfsprogs' package. Signed-off-by: Philippe Mathieu-Daud=C3=A9 [thuth: Adjusted the patch from the lcitools repo to QEMU's repo] Signed-off-by: Thomas Huth --- tests/lcitool/projects/qemu.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 149b15de57..9173d1e36e 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -121,7 +121,6 @@ packages: - vte - which - xen - - xfsprogs - xorriso - zstdtools - zlib --=20 2.45.0 From nobody Mon Nov 25 09:27:45 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=1715595861; cv=none; d=zohomail.com; s=zohoarc; b=NT7i2F5/T0gMfGzG9mdJM8gL4hjj/eTi0/HmMLRzBl5rCDcpS4b55HE2hTpUvm++NB5W8vpz7Rei3EITGqrHARrZjcHe2UUbnaKGm1oSZwvZucqe/ECE6BLoje3tjj9TnFTvAyXtJ0P9hRmLJtz0dhAVxxu8rqErn8kPhnlSqIw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715595861; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=utHiwLh5oAXIe3YFqA9WJIV3CNnvHE2fsUepRznam10=; b=FLc/fIdSZVhkHb1Y1ConpcNKQ5jLvaXuC4leo+jJPILFYXsPXayeT7Hp5A5b3fh9AieZdKehVO5eDGJwncm4Hz43RQbUOIe7V9Qt5btWzjD0G21WqsHjPIOsc8WMpCuzteIP6ijWV6sYtv+NkAMZAjM+FlAxAnnAaZ+lmOn3+38= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715595861136427.29476238493146; Mon, 13 May 2024 03:24:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Spy-0004Tj-96; Mon, 13 May 2024 06:23:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Spw-0004Ta-Jk for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:16 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Spu-0008PB-Tw for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:16 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-571-U4s_37TPOiaGvMWmtuOQgQ-1; Mon, 13 May 2024 06:23:09 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6459680021D; Mon, 13 May 2024 10:23:09 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id E51E540C6CB6; Mon, 13 May 2024 10:23:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715595793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=utHiwLh5oAXIe3YFqA9WJIV3CNnvHE2fsUepRznam10=; b=J+g1rRYhMK+T5jdDuokg0k1443u6SO5HPVxtud77rAjwCD6DCSjwOhDVj/6GJtcq9tZqrb 3BsI8Z1rwIC83M0lJyTWbvCV+oIZW3zHj6AT6ujcfmuXispdmMG1HeOo7hHwUdRde7SoNf QV/HFki6nz/lcZkpAKlU7BtLzIjFHV8= X-MC-Unique: U4s_37TPOiaGvMWmtuOQgQ-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH 2/4] tests/lcitool: Remove g++ from the containers (except for the MinGW one) Date: Mon, 13 May 2024 12:22:50 +0200 Message-ID: <20240513102252.48884-3-thuth@redhat.com> In-Reply-To: <20240513102252.48884-1-thuth@redhat.com> References: <20240513102252.48884-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715595861651100001 Content-Type: text/plain; charset="utf-8" We don't need C++ for the normal QEMU builds anymore, so installing g++ in each and every container seems to be a waste of time and disk space. The only container that still needs it is the Fedora MinGW container that builds the only remaining C++ code in ./qga/vss-win32/ and we can install it here with an extra RUN statement instead. This way we can also add the mingw-w64-tools package quite easily which contains the x86_64-w64-mingw32-widl program that is required for compiling the vss code of the guest agent (it was missing before this change, so the VSS code was actually never compiled in the CI). Signed-off-by: Thomas Huth --- tests/lcitool/projects/qemu.yml | 1 - tests/lcitool/refresh | 10 ++++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 9173d1e36e..b63b6bd850 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -22,7 +22,6 @@ packages: - findutils - flex - fuse3 - - g++ - gcc - gcc-native - gcovr diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 24a735a3f2..dda07ddcd1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -109,6 +109,11 @@ debian12_extras =3D [ "ENV QEMU_CONFIGURE_OPTS --enable-netmap\n" ] =20 +fedora_mingw_extras =3D [ "\n" + "RUN nosync dnf install -y mingw64-gcc-c++ mingw-w64-tools && \\\n" + " ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw= 32-c++ && \\\n" + " ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw= 32-g++\n\n" +] =20 def cross_build(prefix, targets): conf =3D "ENV QEMU_CONFIGURE_OPTS --cross-prefix=3D%s\n" % (prefix) @@ -193,8 +198,9 @@ try: =20 generate_dockerfile("fedora-win64-cross", "fedora-38", cross=3D"mingw64", - trailer=3Dcross_build("x86_64-w64-mingw32-", - "x86_64-softmmu")) + trailer=3D"".join(fedora_mingw_extras) + + cross_build("x86_64-w64-mingw32-", + "x86_64-softmmu")) =20 # # Cirrus packages lists for GitLab --=20 2.45.0 From nobody Mon Nov 25 09:27:45 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=1715596110; cv=none; d=zohomail.com; s=zohoarc; b=dN2VwqbYV0N4OBBYbb95qeXCX0m5LVlXld0M2wmqimUIPF4Rvb6oR0ZwoznwdG98pOt7DbKvScYPg+LPTLLCRlj/IW2cNpTk8myW/suXWVG5zo3aBrZWXOeWQUr6j8GAASnDi5GUm0YlxmAI+JbV46VIzbPRkPoJX9ZwnrkufV4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715596110; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=IL1gm5exzwM+lrlzt4erKlsZoi9hV5FrUZRFx9Ijphk=; b=VIvQwVtaPMPqHyxLIy8ANA/fjIx8vnLE5CANTbbr8p3s9XHD2AOtYEqjszhuF1R+jEjxYU1N8QuhU5VLe6T8wQ5jK90Zlz5oQ0A3qTj7nV7iQ5ox5gTm57oBh5UY5rAh88GN97FYjPhWz0VMRuv1ZEFP8JsMw28lFHJWLLniRJI= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1715596110355512.5854400657593; Mon, 13 May 2024 03:28:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6SuO-0000Bk-31; Mon, 13 May 2024 06:27:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6SuC-0000AB-AH for qemu-devel@nongnu.org; Mon, 13 May 2024 06:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Su9-0001FY-J9 for qemu-devel@nongnu.org; Mon, 13 May 2024 06:27:40 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-382-F7rLz0PBO6aO-uAb0TwUnw-1; Mon, 13 May 2024 06:23:11 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79178800656; Mon, 13 May 2024 10:23:11 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD62C40C6EB7; Mon, 13 May 2024 10:23:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715596054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IL1gm5exzwM+lrlzt4erKlsZoi9hV5FrUZRFx9Ijphk=; b=BwCLTmFNQXxuLIWp9ZXFKH4pL4LELsk91wJALXv0UyVIdnQYBSHSNON8w6AIxhhXgjhvfr fNowhBAMcQmGzkJl7G40idwaz4jMKXEc2XlxASLqbt3yOEb2zNzMwdTm9eWTw8dgVhl4Oc T3Yl8qBccJlcT7C5ZbxKjOkIrELB2kQ= X-MC-Unique: F7rLz0PBO6aO-uAb0TwUnw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH 3/4] tests/lcitool/projects/qemu.yml: Sort entries alphabetically again Date: Mon, 13 May 2024 12:22:51 +0200 Message-ID: <20240513102252.48884-4-thuth@redhat.com> In-Reply-To: <20240513102252.48884-1-thuth@redhat.com> References: <20240513102252.48884-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715596111083100003 Content-Type: text/plain; charset="utf-8" Let's try to keep the entries in alphabetical order here! Signed-off-by: Thomas Huth --- tests/lcitool/projects/qemu.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index b63b6bd850..752079b858 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -35,12 +35,12 @@ packages: - hostname - json-c - libaio - - libattr - libasan + - libattr - libbpf - - libc-static - libcacard - libcap-ng + - libc-static - libcurl - libdrm - libepoxy @@ -54,6 +54,7 @@ packages: - libjpeg - libnfs - libnuma + - libpipewire-dev - libpmem - libpng - librbd @@ -73,27 +74,26 @@ packages: - llvm - lttng-ust - lzo + - make + - mesa-libgbm + - meson - mtools + - ncursesw - netcat - nettle - ninja - nsis - - make - - mesa-libgbm - - meson - - ncursesw - pam - pcre-static - pixman - - libpipewire-dev - pkg-config - pulseaudio - python3 - - python3-PyYAML - python3-numpy - python3-opencv - python3-pillow - python3-pip + - python3-PyYAML - python3-sphinx - python3-sphinx-rtd-theme - python3-sqlite3 @@ -121,6 +121,6 @@ packages: - which - xen - xorriso - - zstdtools - zlib - zlib-static + - zstdtools --=20 2.45.0 From nobody Mon Nov 25 09:27:45 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=1715595855; cv=none; d=zohomail.com; s=zohoarc; b=l60Ku4YNWRUk+eLt71A3A67XdP6v6tyidSZYnBZ4r1RB9cFQLSSbPPfEc7MANtzcRzODQQblpRWpMPMyeUqa60KCfjlOebrxf5xqRux8bjxv7vbcpANYFXzpe9nq7Ri4vZ+9bgmrhQY1wwVE9WtZD0G1EfVq8j0eJ+hsuvbNN68= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1715595855; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=wZwH2tmVLbaNtLMnFMHFmUduvsdLt700PaM3fGnm138=; b=CwayvexA6oT5L7NrrZBmcar56eZCiKWvY4xuUE+z65DJaPW89km4YelI7OpWZ9jnKQp1kB0ShGiTRJMgOaQaGdKzwBaysHF+IV3qn6EZWBe/RLV9TdPjEsJUDZxRPCz9/ncHUYvy0XAZ8ndDYimMhD29n2wXCF33F2SxBFIO2iA= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 171559585553560.27777593411099; Mon, 13 May 2024 03:24:15 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1s6Sq2-0004UP-Od; Mon, 13 May 2024 06:23:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Sq1-0004UE-DU for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:21 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1s6Spy-0008QZ-Ie for qemu-devel@nongnu.org; Mon, 13 May 2024 06:23:21 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-4JzJAqZ1N7Wi9K5BInOMLw-1; Mon, 13 May 2024 06:23:13 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 58D1D800656; Mon, 13 May 2024 10:23:13 +0000 (UTC) Received: from thuth-p1g4.redhat.com (unknown [10.39.192.51]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0CB1340C6CB6; Mon, 13 May 2024 10:23:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1715595798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wZwH2tmVLbaNtLMnFMHFmUduvsdLt700PaM3fGnm138=; b=DnylZgxWWcjwW4Lm++viSLlMz5mWXCAieEYDB0V188Ed9JIMuF+2tYNJTJSBHgkvNyBcgo 1IRkfP/UKiE4iJqefQATYecgKLH+l1GYemWIp8H7buTAKexKPHmyAnZ5lIiVAgnCV49yHY /Lm2DZ8HxW3Sx/erR6WX6HhwxxRGPrY= X-MC-Unique: 4JzJAqZ1N7Wi9K5BInOMLw-1 From: Thomas Huth To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Thomas Huth Subject: [PATCH 4/4] tests/docker/dockerfiles: Update container files with "lcitool-refresh" Date: Mon, 13 May 2024 12:22:52 +0200 Message-ID: <20240513102252.48884-5-thuth@redhat.com> In-Reply-To: <20240513102252.48884-1-thuth@redhat.com> References: <20240513102252.48884-1-thuth@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 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=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.332, 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_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1715595857727100003 Content-Type: text/plain; charset="utf-8" Run "make lcitool-refresh" after the previous changes to the lcitool files. This removes the g++ and xfslibs-dev packages from the dockerfiles. Signed-off-by: Thomas Huth --- tests/docker/dockerfiles/alpine.docker | 4 ---- tests/docker/dockerfiles/centos9.docker | 4 ---- tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ---- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ---- tests/docker/dockerfiles/debian-armel-cross.docker | 4 ---- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ---- tests/docker/dockerfiles/debian-i686-cross.docker | 4 ---- tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ---- tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ---- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ---- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ---- tests/docker/dockerfiles/debian.docker | 4 ---- tests/docker/dockerfiles/fedora-win64-cross.docker | 8 +++++--- tests/docker/dockerfiles/fedora.docker | 4 ---- tests/docker/dockerfiles/opensuse-leap.docker | 4 ---- tests/docker/dockerfiles/ubuntu2204.docker | 4 ---- 16 files changed, 5 insertions(+), 63 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index cd9d7af1ce..554464f31e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -32,7 +32,6 @@ RUN apk update && \ findutils \ flex \ fuse3-dev \ - g++ \ gcc \ gcovr \ gettext \ @@ -110,7 +109,6 @@ RUN apk update && \ vte3-dev \ which \ xen-dev \ - xfsprogs-dev \ xorriso \ zlib-dev \ zlib-static \ @@ -119,10 +117,8 @@ RUN apk update && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ apk list --installed | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerf= iles/centos9.docker index 6cf47ce786..0256865b9e 100644 --- a/tests/docker/dockerfiles/centos9.docker +++ b/tests/docker/dockerfiles/centos9.docker @@ -34,7 +34,6 @@ RUN dnf distro-sync -y && \ flex \ fuse3-devel \ gcc \ - gcc-c++ \ gettext \ git \ glib2-devel \ @@ -115,7 +114,6 @@ RUN dnf distro-sync -y && \ util-linux \ vte291-devel \ which \ - xfsprogs-devel \ xorriso \ zlib-devel \ zlib-static \ @@ -125,10 +123,8 @@ RUN dnf distro-sync -y && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/doc= ker/dockerfiles/debian-amd64-cross.docker index d0b0e9778e..f8c61d1191 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-x86-64-linux-gnu \ gcc-x86-64-linux-gnu \ libaio-dev:amd64 \ libasan6:amd64 \ @@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:amd64 \ nettle-dev:amd64 \ systemtap-sdt-dev:amd64 \ - xfslibs-dev:amd64 \ zlib1g-dev:amd64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -167,9 +165,7 @@ cpu =3D 'x86_64'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-c+= + && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-g+= + && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-linux-gnu-gcc =20 ENV ABI "x86_64-linux-gnu" diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/doc= ker/dockerfiles/debian-arm64-cross.docker index 8cb225740e..6510872279 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-aarch64-linux-gnu \ gcc-aarch64-linux-gnu \ libaio-dev:arm64 \ libasan6:arm64 \ @@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:arm64 \ nettle-dev:arm64 \ systemtap-sdt-dev:arm64 \ - xfslibs-dev:arm64 \ zlib1g-dev:arm64 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -166,9 +164,7 @@ cpu =3D 'aarch64'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= ++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g= ++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/aarch64-linux-gnu-g= cc =20 ENV ABI "aarch64-linux-gnu" diff --git a/tests/docker/dockerfiles/debian-armel-cross.docker b/tests/doc= ker/dockerfiles/debian-armel-cross.docker index e6f37418ed..f227d42987 100644 --- a/tests/docker/dockerfiles/debian-armel-cross.docker +++ b/tests/docker/dockerfiles/debian-armel-cross.docker @@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabi \ gcc-arm-linux-gnueabi \ libaio-dev:armel \ libasan6:armel \ @@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:armel \ nettle-dev:armel \ systemtap-sdt-dev:armel \ - xfslibs-dev:armel \ zlib1g-dev:armel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -167,9 +165,7 @@ cpu =3D 'arm'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabi &&= \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= ++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-c= c && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g= ++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabi-g= cc =20 ENV ABI "arm-linux-gnueabi" diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/doc= ker/dockerfiles/debian-armhf-cross.docker index 407a014f57..58bdf07223 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-arm-linux-gnueabihf \ gcc-arm-linux-gnueabihf \ libaio-dev:armhf \ libasan6:armhf \ @@ -148,7 +147,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:armhf \ nettle-dev:armhf \ systemtap-sdt-dev:armhf \ - xfslibs-dev:armhf \ zlib1g-dev:armhf && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -166,9 +164,7 @@ cpu =3D 'armhf'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf = && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/arm-linux-gnueabihf= -gcc =20 ENV ABI "arm-linux-gnueabihf" diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/dock= er/dockerfiles/debian-i686-cross.docker index bdc9566b67..9f4102be8f 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-i686-linux-gnu \ gcc-i686-linux-gnu \ libaio-dev:i386 \ libasan6:i386 \ @@ -149,7 +148,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:i386 \ nettle-dev:i386 \ systemtap-sdt-dev:i386 \ - xfslibs-dev:i386 \ zlib1g-dev:i386 && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -167,9 +165,7 @@ cpu =3D 'i686'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-c++ = && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-cc &= & \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-g++ = && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/i686-linux-gnu-gcc =20 ENV ABI "i686-linux-gnu" diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/= docker/dockerfiles/debian-mips64el-cross.docker index 4d995d0b12..c861c3bd5b 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mips64el-linux-gnuabi64 \ gcc-mips64el-linux-gnuabi64 \ libaio-dev:mips64el \ libasound2-dev:mips64el \ @@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:mips64el \ nettle-dev:mips64el \ systemtap-sdt-dev:mips64el \ - xfslibs-dev:mips64el \ zlib1g-dev:mips64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -165,9 +163,7 @@ cpu =3D 'mips64el'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuab= i64 && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mips64el-linux-gnua= bi64-gcc =20 ENV ABI "mips64el-linux-gnuabi64" diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/do= cker/dockerfiles/debian-mipsel-cross.docker index 0cf803bda5..fe9415395e 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -82,7 +82,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-mipsel-linux-gnu \ gcc-mipsel-linux-gnu \ libaio-dev:mipsel \ libasound2-dev:mipsel \ @@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:mipsel \ nettle-dev:mipsel \ systemtap-sdt-dev:mipsel \ - xfslibs-dev:mipsel \ zlib1g-dev:mipsel && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -165,9 +163,7 @@ cpu =3D 'mipsel'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-c+= + && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-cc= && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-g+= + && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/mipsel-linux-gnu-gcc =20 ENV ABI "mipsel-linux-gnu" diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/d= ocker/dockerfiles/debian-ppc64el-cross.docker index 6180ec08c3..35c8ff0864 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-powerpc64le-linux-gnu \ gcc-powerpc64le-linux-gnu \ libaio-dev:ppc64el \ libasan6:ppc64el \ @@ -147,7 +146,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:ppc64el \ nettle-dev:ppc64el \ systemtap-sdt-dev:ppc64el \ - xfslibs-dev:ppc64el \ zlib1g-dev:ppc64el && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -165,9 +163,7 @@ cpu =3D 'powerpc64le'\n\ endian =3D 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gn= u && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/powerpc64le-linux-g= nu-gcc =20 ENV ABI "powerpc64le-linux-gnu" diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/doc= ker/dockerfiles/debian-s390x-cross.docker index 90c8d3c7b8..bef9dff17a 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -79,7 +79,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ eatmydata apt-get dist-upgrade -y && \ eatmydata apt-get install --no-install-recommends -y dpkg-dev && \ eatmydata apt-get install --no-install-recommends -y \ - g++-s390x-linux-gnu \ gcc-s390x-linux-gnu \ libaio-dev:s390x \ libasan6:s390x \ @@ -146,7 +145,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libzstd-dev:s390x \ nettle-dev:s390x \ systemtap-sdt-dev:s390x \ - xfslibs-dev:s390x \ zlib1g-dev:s390x && \ eatmydata apt-get autoremove -y && \ eatmydata apt-get autoclean -y && \ @@ -164,9 +162,7 @@ cpu =3D 's390x'\n\ endian =3D 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-c++= && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-cc = && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-g++= && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/s390x-linux-gnu-gcc =20 ENV ABI "s390x-linux-gnu" diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfi= les/debian.docker index 5722482e4c..63d7aac616 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ exuberant-ctags \ findutils \ flex \ - g++ \ gcc \ gcovr \ gettext \ @@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - xfslibs-dev \ xorriso \ zlib1g-dev \ zstd && \ @@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/doc= ker/dockerfiles/fedora-win64-cross.docker index d1a480fa71..a5644de57a 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -80,7 +80,6 @@ RUN nosync dnf install -y \ mingw64-bzip2 \ mingw64-curl \ mingw64-gcc \ - mingw64-gcc-c++ \ mingw64-gettext \ mingw64-glib2 \ mingw64-gnutls \ @@ -96,13 +95,16 @@ RUN nosync dnf install -y \ nosync dnf clean all -y && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-= gcc =20 ENV ABI "x86_64-w64-mingw32" ENV MESON_OPTS "--cross-file=3D/usr/share/mingw/toolchain-mingw64.meson" + +RUN nosync dnf install -y mingw64-gcc-c++ mingw-w64-tools && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-c+= + && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/x86_64-w64-mingw32-g++ + ENV QEMU_CONFIGURE_OPTS --cross-prefix=3Dx86_64-w64-mingw32- ENV DEF_TARGET_LIST x86_64-softmmu # As a final step configure the user (if env is defined) diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 7e6ab0308a..098c894d10 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -41,7 +41,6 @@ exec "$@"\n' > /usr/bin/nosync && \ flex \ fuse3-devel \ gcc \ - gcc-c++ \ gcovr \ gettext \ git \ @@ -130,7 +129,6 @@ exec "$@"\n' > /usr/bin/nosync && \ vte291-devel \ which \ xen-devel \ - xfsprogs-devel \ xorriso \ zlib-devel \ zlib-static \ @@ -140,10 +138,8 @@ exec "$@"\n' > /usr/bin/nosync && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index c4055bdd10..836f531ac1 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -26,7 +26,6 @@ RUN zypper update -y && \ flex \ fuse3-devel \ gcc \ - gcc-c++ \ gcovr \ gettext-runtime \ git \ @@ -113,7 +112,6 @@ RUN zypper update -y && \ vte-devel \ which \ xen-devel \ - xfsprogs-devel \ xorriso \ zlib-devel \ zlib-devel-static \ @@ -122,10 +120,8 @@ RUN zypper update -y && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ rpm -qa | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 RUN /usr/bin/pip3.11 install \ diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dock= erfiles/ubuntu2204.docker index b8e78331db..febd25b320 100644 --- a/tests/docker/dockerfiles/ubuntu2204.docker +++ b/tests/docker/dockerfiles/ubuntu2204.docker @@ -25,7 +25,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ exuberant-ctags \ findutils \ flex \ - g++ \ gcc \ gcovr \ gettext \ @@ -129,7 +128,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ tar \ tesseract-ocr \ tesseract-ocr-eng \ - xfslibs-dev \ xorriso \ zlib1g-dev \ zstd && \ @@ -140,10 +138,8 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --sh= ow > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/g++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc =20 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" --=20 2.45.0