From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676754; cv=none; d=zohomail.com; s=zohoarc; b=H74s/q3mYsPFcDnFqwJwrobzR/+TqBBt59QYBlLsJiwsb2N97FzmYIcdS8GyzkFyigE6aUUu0I/ZrS88NXJUO7F7/mWR/7ToBkqLRJBi6/TdK+5LfXv2fN2MEJFuNxtOR8g8fKzrpE0E9lSpsVomau1Y/JBc/RJkP/ZnV0O8+eQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676754; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=HwwJK3Ic8vOiGmskKxf1h+aCakkNAUYqzvWmUqx2afA=; b=UT/G6apStGm+iB8kadGEtji+rf4H//bVkZamqhcMurF7VlPehnaYwTUKUhGqiWuS/npgzitkSmwGCeUkFSJBbzFehW2omQKXFN+gBu0RzJYz1volSHtVi/ET/dIHIQpk6+XIbhFtzSGIaqViNgg6ouepROY4wMqHxaffhRgWXok= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1642676754675452.11523689614955; Thu, 20 Jan 2022 03:05:54 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id ay14-20020a05600c1e0e00b0034d7bef1b5dso14327812wmb.3 for ; Thu, 20 Jan 2022 03:05:54 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id z5sm9996117wmp.10.2022.01.20.03.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:05:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HwwJK3Ic8vOiGmskKxf1h+aCakkNAUYqzvWmUqx2afA=; b=dCljKkxvjwIBd6xl/FszqYGN0+JCNJRbHXyAnkz34WNUlGBBdU0pYq4YVzlXPhTQqw kPA6dy+AXG91r3a0St0r5UDuUKgs9JC4r3Lbd++OKHhJsjASunWqtPvTZd+pNJHeokS4 /TVM5N3Z3W7XnxNSK38Oy9nr3B7RP7jK9cccsyHi+tT7bvZRtOpdROkWRvExIS0B221T p8/F8BJ5zWAWjA8BnBLH3WT+XQX2k7e/DkBI6odTOPuhjnNHT2uHGcjbtaoJQOTr2cMR PowtUPWnQmWg3Pv+ftznWPdecRD/+JsIRHj+FVdPWB0KIqIKhgcQugXaCCn0CmRYSc5u 8WxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HwwJK3Ic8vOiGmskKxf1h+aCakkNAUYqzvWmUqx2afA=; b=dKadN5yHwpGjPo+kOz4gFqBR9v22A8LUoEhPfm6iDdD5b9pM1FnapfusCP1hjeiEuR Y57oANu41LxZHfSPY+LI6jYKlbuLJpxKQGDWDlGE2Bbl7Giux0GM3I9kdkRVrDdYK6Qs LEuZ4RR90LfR7dJfWkQnReZh4iOf6K5b4vgP4RS1PEj7erevR869FBLePd3Jah3JaJrb lGScQxt+64qikoKTavlMJW07Ydr0l2TKqFYzcdHDzVaCBgvD1NHnLdpeg2aue3u/BTSE PI3rO6vvxfLXqfe8MOIeJZoSx67mIeruGMhnvBxya0sHVgJsEj3tAswRgeY42cqEMI4R LpAg== X-Gm-Message-State: AOAM530v4EdpR1gq5DNti6pL9tlusw/q1BeghWyMmYP17YbTPFutBtM/ MZCOB4PpOPEkfnhpogGba7E= X-Google-Smtp-Source: ABdhPJy0hNH9Ym3YxvYNYS+p2rgoVqeeYISUvNsFvlZg2unmm9AoR4q0Zo8D89zZr1euLtN0bAuxsw== X-Received: by 2002:a5d:650f:: with SMTP id x15mr5858145wru.645.1642676753000; Thu, 20 Jan 2022 03:05:53 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 1/6] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Thu, 20 Jan 2022 12:05:40 +0100 Message-Id: <20220120110545.263404-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676755808100001 lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 893a5567100..fb78499d6a0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3577,6 +3577,7 @@ F: .travis.yml F: scripts/ci/ F: tests/docker/ F: tests/vm/ +F: tests/lcitool/ F: scripts/archive-source.sh W: https://gitlab.com/qemu-project/qemu/pipelines W: https://travis-ci.org/qemu/qemu --=20 2.34.1 From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) client-ip=209.85.128.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676759; cv=none; d=zohomail.com; s=zohoarc; b=Ap2x/PCO+0VWgBgyAGbekCbVsu0rfdLKRLSyagTn0o29b/fFEtiZ6upb9G/bEymq7j1ktnJQHcxbqQzgc0vfVMkMMAtkAxhC3mtuIKKRD7tFYMdp+/A1plhezITPYnOtS/jEbQbxAeSlXaHw/d+Qx15MXhtWuAbQ3WlARZO1in4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676759; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4vjKx1I+N9K2I7ZZkgKBPbK0jQvXhaVoh5ziaAVd4fg=; b=B/IbMjgsXfQr5ACGyzqXiwGjJD9I/ji5BD5R1l01wr7pD95vSZGxsC45rl38Z9Yr59e0Wyo16q7ipXxrwHXQxKK5gFaynP7PzJCNagW8oekE72Mbpj0NdOBJMGAjUyZduDviT9FoqrRvXfjB2toOBsWNCOvXsTpiR4UMlz5uCzs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.zohomail.com with SMTPS id 1642676759825736.7832654507199; Thu, 20 Jan 2022 03:05:59 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id v123so11277885wme.2 for ; Thu, 20 Jan 2022 03:05:59 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id 1sm1997292wmo.37.2022.01.20.03.05.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:05:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4vjKx1I+N9K2I7ZZkgKBPbK0jQvXhaVoh5ziaAVd4fg=; b=GQcrr4l1wGXr7z2PEZaElZd/WxIW03FW2Gc5o3BWf/0tnfXMUbTgJtC/hmNPlL+vck 1kJmu++c+lvM/UW4W2fUwESp1KM4HVd79YEwVemm/myntaQKdnoywEurLyKkR2hZRDbE WakKCs+qipqwUMuTnUlGb+8ANc7hYgtWoXH2F0zqDH/rQlRvQrxmD9+Hg7a2HDTct6Wr MD53NY3YwPG44ntA8kJUTPGPI0ZyxdMVbDuogPDRhQWrgM9d3++a+h9opVV+PcimhzlF FrxzDe4fq+g3Lmg0NoKDaxYSXvaHI2le9DUt3WnBqbMsbKIiTkyCNW4YxRUA3Q913Est YHYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4vjKx1I+N9K2I7ZZkgKBPbK0jQvXhaVoh5ziaAVd4fg=; b=srV8IMFSP4k4UpVjUXx9H5iG95EvotBwRt+6INCvbtmktso/KCB+VqDJvJamCxa4AI +ysNOiY4EMbMdrSaWiDzALOGfTu671P+0cePmJln7AI+CmfK5vhs/OMqYUczSvDh3BL3 qii/ezDrtAngBpgRn7fttbFJDUpwe7aBbV7Aky0UNuJ4gRbUvCVF+Ne+yDlRhQdwfPeb g1EG504lR9vW6gQSLcCLNU+t2V/6JmAaDJ0BA6NUjurj4qiffdTsk9VDkZGfbFKwIzqO 111kg736kOZiyKDtoSrjrtFPf7Af9JTpSDv6s0ZvBAq2mdXKWx+bhFAjBTEiG6Utatyf LXEw== X-Gm-Message-State: AOAM530heGzcjvHkKSmapmtGwITs+wCENp8NIRgwxBSxf0QMcG2D/hnj UBFAk2GO470jxhzF2C5YMvNDObwOFtw= X-Google-Smtp-Source: ABdhPJy474OHCqrqDR5HydFxEXCRZJtT8ZQCXu/Y5S1JVMmUr6iplED7zOY7BFgp1MRBbT38/CKtfQ== X-Received: by 2002:a05:6000:2ad:: with SMTP id l13mr16035818wry.374.1642676758070; Thu, 20 Jan 2022 03:05:58 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 2/6] tests: Refresh lcitool submodule Date: Thu, 20 Jan 2022 12:05:41 +0100 Message-Id: <20220120110545.263404-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676761767100001 Refresh lcitool submodule and the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/alpine.docker | 3 ++- tests/docker/dockerfiles/centos8.docker | 3 +-- tests/docker/dockerfiles/fedora.docker | 3 +-- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index eb2251c81c8..9d7f74fc51e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -109,6 +109,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | 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 && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index cbb909d02b3..fde6a036263 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -69,7 +69,6 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 60207f3da38..82f504e40d6 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -77,7 +77,6 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index f57d8cfb299..30e7038148a 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 0ffa3c4d4b5..4ea272d143b 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 4e562dfdcd3..90988b2bc53 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b9..226c178a2a1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457 --=20 2.34.1 From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676765; cv=none; d=zohomail.com; s=zohoarc; b=mLvpZdQu0r8Uu3cusVMRrvuusn6aQqzV3yGVZG6n7zWFk5f0php7iYTaGwEySmIpLBKm8W9ylwHkSr9z8gb+xAixoy2cPMZjcI0NgS7ESl2gkdbLOhWZLk5iTaxe7s/ENEYi5OqCC/ojhTidxEZ8uAt+W23SmeN0INHGUYHCbBI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hLgqbzNXFs/GpIvzZYV2CAjeBl5SzV+RyDP4Wa3X0i4=; b=U1uPAN3P6DnHVzrhr0rRy18j5O8voPdsDtpE7BOdowwE9WSUcc5NCg1OZ/C9rg4CcJRfQWuJ9MKAOKT7FVxPEU4KYNRI61F9QjB9lTpTz2vg0ccOlaGwGBy2ShbEgDMAlWlRtOPpa377dAHbFl5RqIDxAM8/OX4PBVgW9RAMokE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1642676765258374.1789777982052; Thu, 20 Jan 2022 03:06:05 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id o7-20020a05600c510700b00347e10f66d1so6697588wms.0 for ; Thu, 20 Jan 2022 03:06:04 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id g7sm2337338wmq.28.2022.01.20.03.06.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hLgqbzNXFs/GpIvzZYV2CAjeBl5SzV+RyDP4Wa3X0i4=; b=IaRta1HX4w82N4CbjpOMRPSEPdGe2WdCj9KbjIhUvOApynh9mxLmI5rBYvLu12v2X8 eLr2D8JfBY6pDzGttnqobbBDWQuPAH1lR9pD0tiKwUUPeBwpIdCpFxoi1r/L5cKY7TfS nAQZDgU9m9eEXGCxrS4q902hkLmQQg4kMJPE8dWeJgWIH0VMfzSxk9vi6rgs87En2yTz BmHwCz/xq/VoMRvu3vO6480YbMeshG5Ms7nuhO3LvD+iX4ETi711cXuG4N+tTA82c8CD aH6Aq5MJyR/Q0hgYIpjM/n8LhcsislqFr6aXClumZ0FzIsIaRAdfB1GWlmTQ7jPtFlcW YNfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=hLgqbzNXFs/GpIvzZYV2CAjeBl5SzV+RyDP4Wa3X0i4=; b=bJT66U1x5s1KOwjXEpjlesxgaSnckFHmPj3e5WB/CGFq89E4NCjcsNi6Io4u/wGfqd YXHDSAdtGn4CJAkOuroCCkUwSsOWrjdxe8dYHpCTgg/i9r6JJyLyIGh/6YCw7vW8Rseq /MzBIvBUTID4r8XEMc1VVez5G1F5pDZlD1WP1dJ9ijoiMANLVY8peOAoTXEkhaTJKuRm ZaFQOYNyIoGALETR3+pX0LM5c6m9Go3tLVlKYUuR9RUOg4a6stRfNpPTJqE7G38G9v+R tt31h1XmI+5A2VgL2nPx1niRyK0LObgObpz03VmACFloXG1Oa4mkAGGXTUoTGqJbRn2c eddg== X-Gm-Message-State: AOAM532o74A9iWb6OFgeqigCYRJSEtqivQ9mg6+XzanBMDoqtUWk35Jn PFNPIj+ojD3ou+28PMI/SRc= X-Google-Smtp-Source: ABdhPJzFwEZYM+qAYQqTh1h4v/ciMq7kJ/mh+U5G3H2GIJcSTyg95ODZc0juK3z3NWzzM+BinoSHsQ== X-Received: by 2002:a7b:cd02:: with SMTP id f2mr8390320wmj.68.1642676763055; Thu, 20 Jan 2022 03:06:03 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 3/6] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Thu, 20 Jan 2022 12:05:42 +0100 Message-Id: <20220120110545.263404-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676765661100001 On Debian we also need libibumad to enable RDMA: $ ../configure --enable-rdma ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present. Your options: (1) Fast: Install infiniband packages (devel) from your distro. (2) Cleanest: Install libraries from www.openfabrics.org (3) Also: Install softiwarp if you don't have RDMA hardware Note, librdmacm and libibverbs are already listed in lcitool's qemu.yml. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- tests/docker/dockerfiles/ubuntu1804.docker | 1 + tests/docker/dockerfiles/ubuntu2004.docker | 1 + tests/lcitool/projects/qemu.yml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 4ea272d143b..7ebaab82b97 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglib2.0-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 90988b2bc53..b93707b70d4 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index ed5ab1407a9..948b9912579 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -43,6 +43,7 @@ packages: - libfdt - libffi - libgcrypt + - libibumad - libibverbs - libiscsi - libjemalloc --=20 2.34.1 From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676769; cv=none; d=zohomail.com; s=zohoarc; b=H1T4+t6ZMmvJJyhiPNF5i80Xj+JwyExiE/TVL6gCDeM9wDAhPGVWnCVP6rJ+VYa4e4c4/G1VoV+7jC8iGiKGpOHf+jvBAF9ujykfr/72ngJP9pvzOWqKVN80hrkCndeBpLZd0jrdt4NHz5kKkXXefBWZPp/fC2G59l032yJdbfY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676769; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=WxWriVE1ssSmHCuwjL9f/3A2/ZRCLxWRYTu0rGXBP3I=; b=FvxJkvhpYae0nYpR/ApD/1bDW3MC0Ouy7pJ44vJmLGRYcx0IxMQ41Ozb1PJFPaedJN337RL3RK+eDuNd2SViB9dKL+Wb2HjbgxktLx40KuPvmzz1MOvtO24rTJfjNkfSwLInt8bi/VWUh3TH2GApX31j177nwrWC5Z7Zhj2UGLU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1642676769773251.67507696488553; Thu, 20 Jan 2022 03:06:09 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id az27-20020a05600c601b00b0034d2956eb04so12749432wmb.5 for ; Thu, 20 Jan 2022 03:06:09 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id h127sm8983005wmh.2.2022.01.20.03.06.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=WxWriVE1ssSmHCuwjL9f/3A2/ZRCLxWRYTu0rGXBP3I=; b=EQcYSxVPiJADHJ7SzbuIwlYHW/eADHeGgdKsXKDqGuiqml4ByPutPzGbAmr4bVOvvQ kgCAawENgAt/AxOCc5vPWaYob+MXTbVuDQBtUzJKJaR4HCFxsYd5cvZze03Lo9EifOac MHZFx8VgmT4e2DgJXtd8lSeBCBnSXghWx3zcntpfN0RgaTS5pdtL/vALIPdlm/pcWgPF QSwP6sw2cmIITd+6GXK8Y6kcp4YqfM0fTcLyXneRe1qYwNxCedjNKuFFU5jrA3PJseqH KmMQd0KOYOVgFyCBih6o3O1XvsLOecKYzQqjMefdaocGuCInj75f9txkLhbOxJ0KwmtC 4N+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=WxWriVE1ssSmHCuwjL9f/3A2/ZRCLxWRYTu0rGXBP3I=; b=RSXnRexdKetOQGgD8lex4/Y6yewQ/DDhrU0amg9/4/+cJ/vZGRTSkg+dYZ6FVYbbE+ WNwqgqMB1iCS7lz3wteStQO9sS1Qm6VwxUmlsGsFnWBQnZ/ywx78w96BpCIWuOk4gUmg g7bWLeobIj/6ScbB07dX/dCPuX9gd0XvVzWdc520D7y3yVb9w8QQ8TdCOJVyLxO+MBRq rdI4qwdc/IGtU6MhQvEe5KJsHDfd8A53FfW68fO/mPd+m9c7xMleHaxBupWlq4l73WRw sGvQxomhJQK8Lz8J+PzzyQ2j/IAcepWbDeEl0z60btBY2P2mkuYSdtwmrOh3fht1dfkU JGDw== X-Gm-Message-State: AOAM530pkDMEMgNtS/3S0gsPrVuTCRGtFcjdK/O6my0ddnM/ok615cp2 HujFs2CGv7CC/X6YCyHHm+E= X-Google-Smtp-Source: ABdhPJztC9TY+hA3TpqE9dUtJG/pyiqDWHhSFIcNUx0EKePjlQ6LxRe3eLHby+nuPo2NpcP90d9cXA== X-Received: by 2002:a1c:c908:: with SMTP id f8mr8400204wmb.193.1642676767983; Thu, 20 Jan 2022 03:06:07 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo , Stefan Hajnoczi Subject: [PATCH v2 4/6] drop libxml2 checks since libxml is not actually used (for parallels) Date: Thu, 20 Jan 2022 12:05:43 +0100 Message-Id: <20220120110545.263404-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676770790100001 From: Michael Tokarev For a long time, we assumed that libxml2 is neecessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in while qemu tree, we can drop all libxml2 checks and dependencies too. It is even more: --enable-parallels configure option was the only option which was silently ignored when it's (fake) dependency (libxml2) isn't installed. Drop all mentions of libxml2. [*] Actually the basis for libxml use were merged in commit 25bfd5a75 but the implementation was never merged: https://lore.kernel.org/qemu-devel/70227bbd-a517-70e9-714f-e6e0ec431be9= @openvz.org/ Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi Message-Id: <20220119090423.149315-1-mjt@msgid.tls.msk.ru> [PMD: Updated description and adapted to use lcitool] Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- 6 files changed, 2 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index 333c61deba7..64a146e1d06 100644 --- a/meson.build +++ b/meson.build @@ -449,11 +449,6 @@ required: get_option('linux_io_uring'), method: 'pkg-config', kwargs: static_kwargs) endif -libxml2 =3D not_found -if not get_option('libxml2').auto() or have_block - libxml2 =3D dependency('libxml-2.0', required: get_option('libxml2'), - method: 'pkg-config', kwargs: static_kwargs) -endif libnfs =3D not_found if not get_option('libnfs').auto() or have_block libnfs =3D dependency('libnfs', version: '>=3D1.9.3', @@ -3489,7 +3484,6 @@ summary_info +=3D {'lzfse support': liblzfse} summary_info +=3D {'zstd support': zstd} summary_info +=3D {'NUMA host support': config_host.has_key('CONFIG_NUMA')} -summary_info +=3D {'libxml2': libxml2} summary_info +=3D {'capstone': capstone_opt =3D=3D 'internal' ? c= apstone_opt : capstone} summary_info +=3D {'libpmem support': libpmem} summary_info +=3D {'libdaxctl support': libdaxctl} diff --git a/block/meson.build b/block/meson.build index deb73ca389f..90dc9983e56 100644 --- a/block/meson.build +++ b/block/meson.build @@ -58,8 +58,7 @@ 'qed-table.c', 'qed.c', )) -block_ss.add(when: [libxml2, 'CONFIG_PARALLELS'], - if_true: files('parallels.c', 'parallels-ext.c')) +block_ss.add(when: 'CONFIG_PARALLELS', if_true: files('parallels.c', 'para= llels-ext.c')) block_ss.add(when: 'CONFIG_WIN32', if_true: files('file-win32.c', 'win32-a= io.c')) block_ss.add(when: 'CONFIG_POSIX', if_true: [files('file-posix.c'), coref,= iokit]) block_ss.add(when: libiscsi, if_true: files('iscsi-opts.c')) diff --git a/meson_options.txt b/meson_options.txt index 921967eddbb..95d527f7732 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -113,8 +113,6 @@ option('libudev', type : 'feature', value : 'auto', description: 'Use libudev to enumerate host devices') option('libusb', type : 'feature', value : 'auto', description: 'libusb support for USB passthrough') -option('libxml2', type : 'feature', value : 'auto', - description: 'libxml2 support for Parallels image format') option('linux_aio', type : 'feature', value : 'auto', description: 'Linux AIO support') option('linux_io_uring', type : 'feature', value : 'auto', diff --git a/scripts/ci/org.centos/stream/8/x86_64/configure b/scripts/ci/o= rg.centos/stream/8/x86_64/configure index e05f2fddcc2..9850dd44444 100755 --- a/scripts/ci/org.centos/stream/8/x86_64/configure +++ b/scripts/ci/org.centos/stream/8/x86_64/configure @@ -81,7 +81,6 @@ --disable-libssh \ --disable-libudev \ --disable-libusb \ ---disable-libxml2 \ --disable-linux-aio \ --disable-linux-io-uring \ --disable-linux-user \ diff --git a/scripts/coverity-scan/coverity-scan.docker b/scripts/coverity-= scan/coverity-scan.docker index ecff6ac5b4b..6f60a52d231 100644 --- a/scripts/coverity-scan/coverity-scan.docker +++ b/scripts/coverity-scan/coverity-scan.docker @@ -59,7 +59,6 @@ ENV PACKAGES \ libubsan \ libudev-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lzo-devel \ diff --git a/scripts/coverity-scan/run-coverity-scan b/scripts/coverity-sca= n/run-coverity-scan index 6d443250a9b..181bdcb2638 100755 --- a/scripts/coverity-scan/run-coverity-scan +++ b/scripts/coverity-scan/run-coverity-scan @@ -402,7 +402,7 @@ echo "Configuring..." --enable-libiscsi --enable-libnfs --enable-seccomp \ --enable-tpm --enable-libssh --enable-lzo --enable-snappy --enable-bzi= p2 \ --enable-numa --enable-rdma --enable-smartcard --enable-virglrenderer \ - --enable-mpath --enable-libxml2 --enable-glusterfs \ + --enable-mpath --enable-glusterfs \ --enable-virtfs --enable-zstd =20 echo "Running cov-build..." --=20 2.34.1 From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) client-ip=209.85.128.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676774; cv=none; d=zohomail.com; s=zohoarc; b=bdLh/VbFs+KDr9LJdTx4K2hHMKzyDRMJFBKEHLfm/m/oXeb7b3Q8reDLUO7ZBnzY1fLSGnoYLzMJgbODDZKk0KaU472BAUNCxlhaurkIlIGikCg0XNgskTtveb29OJamfHJc6Uox8fbpCPbeJ/cllGbCbBORtht5fu1akl2UADM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676774; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=pS9OAWouq8KVRXzw5bYHPfuW4Mi4STgtGz18wqOGCxs=; b=CpaRAiXvs9tbyK0uMbchF8PxTZ4UxEI3GCTS0t3bo5yaMwOBO1M0FbT9fdwlM/SHAuo6VDnTBLVeuCCob5TNWj9Z57f6O/hvuTDXiDF1NDm+k5cVs4sCccH7cc7t/EZtG+o/2cUhbRCZl2rE1MI59Tnqg+wwyyvaUf2xv3ZAHoA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mx.zohomail.com with SMTPS id 1642676774535859.5984304101137; Thu, 20 Jan 2022 03:06:14 -0800 (PST) Received: by mail-wm1-f54.google.com with SMTP id p18so11220930wmg.4 for ; Thu, 20 Jan 2022 03:06:13 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id o12sm3327420wrc.51.2022.01.20.03.06.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pS9OAWouq8KVRXzw5bYHPfuW4Mi4STgtGz18wqOGCxs=; b=MLhCIr+Dx74olbOarPOkf+xogU5DK0paUesCvxZCauG95Xkc8LhMYZUAuyPNFQnokd 2BCtIuhy2Rp8ZiZQ4C5YaumWv9uGlix6lu7nPsWOsoytfbePixfQvw0bUeIyI4giU2dt 46REAbKsS0y8NOAtlBPEjwkRJhBmqp9NpKLwkTnmhwrASsXmrgft1mf+MINWwWEol57Z HVyXC6hz9pngi9iNDTZtM3VkJ3dmmkiO9hiv32jYmZsee8B5Uc8LY3MdZhuADUR/Ks4m e10CIqpYmI9PR1LYhtyjVcvF5DHU25TzQE3w58s0tP/AG+iJC/Kv8xIIu9rD1sgoyhZ1 LXrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=pS9OAWouq8KVRXzw5bYHPfuW4Mi4STgtGz18wqOGCxs=; b=MxqJTFWEe65EFKBPzocF1I1qBPtQwnvMdwRe8c7ntG3vuXKy02pc46SOckvBddpjne DQBBBGRx+xUYerFUVhm32Q+VfrAD6UrzgOAifLwK1CZQeUg3x/PakDN0csQIhAN4wqtg o4N//Lqi5XyDhgFNOYPTBYSVaQXZVNgmHcaO0HjqpZs2fbLegOjds9h4C6/59/UaN07T oSuTN+qspGLeODjhFm53ieUzoouXKGSbRzfX7v4vMZ7T6kBCTWOWL29f8R98CfiN2Zhy nln0rjNpMiJ6084FFe2M42yMpeX3UC7EvuuNkdUwKC1HAQbKzuIrmBeB0Qf80o/JTp4j gU9g== X-Gm-Message-State: AOAM5320cgt2eX/94xCC2zfnDCsaYIpPIhKvjYiqfuQVTbyKyBxq51FF SFfGiD+TJ5Rfe9+9kw/dL0c= X-Google-Smtp-Source: ABdhPJzHhlNG0NHXc8QxI7A/V+QpryGeaKTHyinDFTjaum+dLJWMrgwwWA2GaAJwnS1ZdXNl7HkScg== X-Received: by 2002:a05:6000:1002:: with SMTP id a2mr32204697wrx.157.1642676772787; Thu, 20 Jan 2022 03:06:12 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 5/6] tests/lcitool: Remove libxml2 Date: Thu, 20 Jan 2022 12:05:44 +0100 Message-Id: <20220120110545.263404-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676775891100001 The previous commit removed all uses of libxml2. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/docker/dockerfiles/alpine.docker | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 7 files changed, 7 deletions(-) diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index 9d7f74fc51e..591af43d60e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index fde6a036263..3abac7a8b13 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -71,7 +71,6 @@ RUN dnf update -y && \ libubsan \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 82f504e40d6..1d01cd94405 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -79,7 +79,6 @@ exec "$@"' > /usr/bin/nosync && \ libubsan \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 30e7038148a..1b78d8369a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -71,7 +71,6 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 7ebaab82b97..699f2dfc6a9 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index b93707b70d4..87513125b8e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -92,7 +92,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 948b9912579..958868a6ee9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -64,7 +64,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust --=20 2.34.1 From nobody Fri May 3 05:24:06 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) client-ip=209.85.128.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642676779; cv=none; d=zohomail.com; s=zohoarc; b=j5NlZeQ4PEWboWGllPAeAxh9rU3STwX7/JfLsRybdEQ2am2DbbhBfoZsAS+JwQF8WSpHTItTb2VyWa46naJrTw5f4RHDBudV58GqVfTA3a1CKYkrD0ZdcWfYLumBUXPAracnaGFLq9h7W/KlwfxL2Oo0Dl6q8NR/s7BDa5vQcSE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642676779; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=xPHUAsR02tGl97Ap5cxvHh0G/aTL5XzanhOn1Ca3aRY=; b=oIvG6BlMHEptKl4NaToyG9vBgCCV/BD7uF6pxnQvJ7HjsRAviFEcy5m/ermh8Us5BSPUK3kk2ntqgrpIqn8E4xRKl42ldPB7v7TiN+32EmxbffnGfaeqJ9cMvCzBEbCh0E5AyvMlMHUcJmdrlxPUsR7aCr1TOwRH7lAMw6zL7Do= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.zohomail.com with SMTPS id 1642676779355459.6268005681941; Thu, 20 Jan 2022 03:06:19 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id ay14-20020a05600c1e0e00b0034d7bef1b5dso14330453wmb.3 for ; Thu, 20 Jan 2022 03:06:18 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id f14sm2548821wmq.36.2022.01.20.03.06.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jan 2022 03:06:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xPHUAsR02tGl97Ap5cxvHh0G/aTL5XzanhOn1Ca3aRY=; b=QU5k8silBjaX21Obx1+veqdvqyIySO5RV2Hj6k3VgwGQwMutTi+I2kjsreq6jS5Kpc 90xZNqtDZX/ueEP+o/It9UkjRubEwQH/ALHNoNPg/RO1KcdHsKOwwqueAuAw4LjkO7FW xV1X4EK2v04wP7OU1UHY9rHERKnO3/rRBRA2SCBLz3+RVJIBn2ZmQ00N+2BDfJtlzCSo Lcsoz3f74ftaLFQAe1zE+ZGHS1DggnxBBC5QhAT60ffHVkuF/1tTTmny3YZTlhIOiJns zeAvrkL+Rm8NP8Olb+dGOJL18uJZbyvLdbk4byAM0aSzHjhOgd+Tt+vSPK1oWUm7EyYQ AyZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xPHUAsR02tGl97Ap5cxvHh0G/aTL5XzanhOn1Ca3aRY=; b=azMS6GltqH1u/nmd/Jkhlipznd4mX0U5Gdb4HEP8LHvlkM5fIn5GU/cV8x6J0fAdYr J/WPGjzMNXh3djt7/l9/w99v36K36Fpu1eYEJuV6vCPHpCtqEchgNy/M+pH70DR0zP03 AxWco5vuLscXBlmvteFaQKotcPyhzI6H2jenxtY2SgvSy7MQ7VMYWAEOWdDst97QDVxW 2h+U5SDSsw0SBKP7fF0vfsYWSzBteax5PqdMS5sHWEkASPgtVO2l0WVJO8Juq98wv9ep SB9xdx2TIRQh03BW1WYixm7MFiXplXV9bwIe0tAeoMa7/VrCxFLroOut2yLn8E2cW39K TmVg== X-Gm-Message-State: AOAM531idHckhbXR0OnIaBdN7T+nPd99o5JJtWBCAg46CArr0hjID0Mx etuVUs1kFPmcjP0JWw1xwWk= X-Google-Smtp-Source: ABdhPJw74IEEk7DQcm2AsJnFI4LunRFn9IYrMNRx8rzcOKrHNZQ9oazFKapXzK6jL773DfJZCSbi4w== X-Received: by 2002:a5d:47a8:: with SMTP id 8mr19868864wrb.675.1642676777644; Thu, 20 Jan 2022 03:06:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ed Maste , Michael Tokarev , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , Li-Wen Hsu , Peter Maydell , Yonggang Luo Subject: [PATCH v2 6/6] tests: Manually remove libxml2 on MSYS2 targets Date: Thu, 20 Jan 2022 12:05:45 +0100 Message-Id: <20220120110545.263404-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220120110545.263404-1-f4bug@amsat.org> References: <20220120110545.263404-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642676781034100001 lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 --- .cirrus.yml | 1 - .gitlab-ci.d/windows.yml | 2 -- 2 files changed, 3 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 02c43a074a1..7552d709745 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -32,7 +32,6 @@ windows_msys2_task: mingw-w64-x86_64-libgcrypt mingw-w64-x86_64-libpng mingw-w64-x86_64-libssh - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-snappy mingw-w64-x86_64-libusb mingw-w64-x86_64-usbredir diff --git a/.gitlab-ci.d/windows.yml b/.gitlab-ci.d/windows.yml index 62dd9ed8329..1df16303491 100644 --- a/.gitlab-ci.d/windows.yml +++ b/.gitlab-ci.d/windows.yml @@ -44,7 +44,6 @@ msys2-64bit: mingw-w64-x86_64-libssh mingw-w64-x86_64-libtasn1 mingw-w64-x86_64-libusb - mingw-w64-x86_64-libxml2 mingw-w64-x86_64-nettle mingw-w64-x86_64-ninja mingw-w64-x86_64-pixman @@ -80,7 +79,6 @@ msys2-32bit: mingw-w64-i686-libssh mingw-w64-i686-libtasn1 mingw-w64-i686-libusb - mingw-w64-i686-libxml2 mingw-w64-i686-lzo2 mingw-w64-i686-ninja mingw-w64-i686-pixman --=20 2.34.1