From nobody Sun May 5 12:56:44 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=1642770151; cv=none; d=zohomail.com; s=zohoarc; b=DGufW+07RDmwJvF+RVbno+EN9OPnk3lnEYIcNTE/ShJ0hlvvhYOXrEUNtz/+vfThQMUYaDY2SRMBjbwGsofRlc5vyhaWRVODP3jdEfxL0kpYSybtfq2QNvpSyKSaA7MkoOGk0uWPzV/ZSayi8IImtkuAiYrMeWgA3943e5Tuvm0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770151; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=cDOop7khDdVBUfqYbonoVWR/okeeUgMt6C/R7mwayVEunDMGevKHeHF+rackRFFN99vwXPYbUcxilwz/1NRMhQsPouhDPZ1WzxeSghjwJkb5r3OYSdU0E+uX/+gCm3xwzKdXZRGny4h/yDfD83IZ09bZCxKo4S4T1lDdTJAamiA= 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 16427701515671014.467116553598; Fri, 21 Jan 2022 05:02:31 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id v123so17848546wme.2 for ; Fri, 21 Jan 2022 05:02:31 -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 n6sm6531183wra.54.2022.01.21.05.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:29 -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=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=QsXzbmxzIPJKXHo2M3By8RCchOyRQOTPY9uNPQOwY8fwffPq6OOjiTGyZSvPIVAMnO 7MH/4rwLLEqs9mISStJSQsWoEg6e8qdvsXyL+3g0QvWbqu5Y+N9XmDeby6LNIqnvgsg3 WF2QkI0/XXSyALxyCFzCKoEbWEnkKxQ2ZHPD6Onko2jABX9YVjFtvxj44ZDR8Of4OFXv vHapI9QNIspV8PP4KXL9LhiK7zQmWtknxSNlFaGvBCDbFM2QKIunKg8tWNETSQhfPBvK h7KZDnmcwNbVIFnsxwa0aKtfFDLOy5O0jTCaoUYYi8k60hu9z8nVKYz0G99Zwzbkim78 F2tg== 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=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=DwtcpLZ65w+eA4GXCSGlOhLprJu/NDcafneqDBlonxRxIClxRWZOFR9mxxb+v2j7Ul VUKos4E7rrINYRl7yI9xTC8hmSIvVXQ9ZQ+qVNnvQ6uidq00+sUO6B62QZrerhMc323y DcuRC4+1YPuvoLx5MmtsAtV7GwyfNjX3TqOQL3hBqhecVxcfnNhgC1iZTFPrGxy4Pw9j HuXJ/apljWnXJsvjE6SbQKi5elz4jBp1UoAgES+ng+LfXk5enOcXjrYeOtFn3LdWNs2R RXshbhZH9rYX0DReLde7Lt1yT5sCfkwCugbrvPWDIolrUKcXs58QltHwwJSxDF96CqBi LeJg== X-Gm-Message-State: AOAM532pqtSpdjbhXpnFvtl+O5KnycI3ITnqR/dny+w6DK+djYzMrmzA r0NQy3mQmQ8T5OdxAFEzzrc= X-Google-Smtp-Source: ABdhPJxwQO7P35FB5wTWumlUBODL5qpBY7GZaIK6N+Dtu1yTHsyeVb5nWUPO8JoxdgiELLnEH5CrYA== X-Received: by 2002:adf:b601:: with SMTP id f1mr3780955wre.271.1642770149892; Fri, 21 Jan 2022 05:02:29 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Fri, 21 Jan 2022 14:02:16 +0100 Message-Id: <20220121130222.302540-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770153160100001 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 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index e4b3a4bcdf4..6d5539d46f1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3579,6 +3579,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 Sun May 5 12:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) client-ip=209.85.128.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 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=1642770156; cv=none; d=zohomail.com; s=zohoarc; b=gLSTNDhnF1TSYVzMoBlhefrflr/Etw07b6DLGMaMTwCQa66NQTZTLSUpYkjs4rXZIFF0gaj4zM2vOIClAS4zW+I8/iIw0uDDVYnDi4EfTdkZuqQb7LPP5nQ/cie2VO2UW7A//Mrlez1yY7nOMv2njx+HshgMyWBjBG08mqWOuhc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770156; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QHeqOg1fCgtx7ni/iHjS3u5wy+2uDfP4jJvs5BysbmY=; b=jQXZ0h25/BalREnNQjL/BwN7K/p9SYsX4gpmrsXo2Fxz6wQ+GU3YYmXcIJmbvrsqzxdux/vzG3y1kIZWwoXlnqE3voE6i7x1IY3OmpT0QYsHdubHVeRzzFvJCO4g7RQsu+hdIaTMg1Ida0eLz20iJATWYGFhkw12FzkEfue7xSk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.zohomail.com with SMTPS id 1642770156521325.68297501529844; Fri, 21 Jan 2022 05:02:36 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id f202-20020a1c1fd3000000b0034dd403f4fbso18956358wmf.1 for ; Fri, 21 Jan 2022 05:02:35 -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 12sm4937637wmf.18.2022.01.21.05.02.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:34 -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=QHeqOg1fCgtx7ni/iHjS3u5wy+2uDfP4jJvs5BysbmY=; b=mc+yvOnEBJi5SSRmjjhU4qgQpVtcPaWJTBXmgs2/fPaO/ZujHFqBx94rrm+j1E8wEC aF/VYqil7dpumVajgBt6C0tPYRJZmTWtb0aRTTOi8/v39PQmcP7TM+9EVfFOoTjug1jw oVdKSyVhzY4Qx51QSP0H7gghNtkr9azAUDW7RbqqhSbkRBuBNa75kt+RsD3ARa58++VH UEROUoXU4gYyOW5x6i+fl1WFjDzdsSqWFsHNS20G26ZN24duV7oOQ8MPpPquuwvJfRHp QAKxdntAk+Y/pRAbPDAHOWomI6JpZgpMii3j+3Rscso0MVxGf/jwcQpSXKKDq4Fu7Mgk Yz5w== 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=QHeqOg1fCgtx7ni/iHjS3u5wy+2uDfP4jJvs5BysbmY=; b=xBVkcgnkbMJsAsa3sy63m0XW5b8A5QLOXs+T1HocNq2NwqOviV61yoPcStwOVkjPaj tmAxN/i+Gm/gzIvziCNHo9/KTzyO2jhNECTSmFfV72LO3B78QrUOap0eRZ8SEP4CSpmF rlcZwEePh6e+ag7Y6Y7LO88IL1GOpti6alF+vCiVB0kvUj/f26UGGph2sLOYkRnCKCtS u7Lf0BizdQNA88GiLNclxifPwDCdS2SKueq6Utp00tKY65+wUGEEWvNv0XcoZEnZ67kI 5G5MzKoqrnt0uofgqRz/YqRGLY6HMEoN6ZVTOqKH+n7jp44qMa1nXh+wXL+sYAfMLEcL 7JLg== X-Gm-Message-State: AOAM5300FD4+9MVvV8tTmvuOKMe8E/k1Cf2C+nIuwGiVMmFcnLhxvrl8 +lWtlH7LlQCtFVNAKYXwzXk= X-Google-Smtp-Source: ABdhPJxr/6mViFnjgUViw2Bjlp1uNQFPbVOstGhWIY0U8HCnJVSGWmZIb21L0S5s30a7T2vB5xejGQ== X-Received: by 2002:a5d:650f:: with SMTP id x15mr3699076wru.645.1642770154777; Fri, 21 Jan 2022 05:02:34 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 2/7] gitmodules: Correct libvirt-ci submodule URL Date: Fri, 21 Jan 2022 14:02:17 +0100 Message-Id: <20220121130222.302540-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770158216100001 Correct the libvirt-ci repository URL to avoid this warning when cloning / refreshing the submodule: warning: redirecting to https://gitlab.com/libvirt/libvirt-ci.git/ Fixes: 4ebb040f1fd ("tests: integrate lcitool for generating build env mani= fests") Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 84425d87e28..f4b6a9b4012 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,4 +66,4 @@ url =3D https://gitlab.com/qemu-project/vbootrom.git [submodule "tests/lcitool/libvirt-ci"] path =3D tests/lcitool/libvirt-ci - url =3D http://gitlab.com/libvirt/libvirt-ci + url =3D https://gitlab.com/libvirt/libvirt-ci.git --=20 2.34.1 From nobody Sun May 5 12:56:44 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=1642770161; cv=none; d=zohomail.com; s=zohoarc; b=b4TNN7Q+X5SrZtSD9UWRB+PnC08KSwj1FnfSv3DEOK5tobHPtGc3PzO0yUC2wprnYXo1f9eqR0WJiKYgqqu2XRH6hgpH9iECPAbPSXPzQDoZ4ks0lFj5DzXZg8QTadtdOXbh/JnR8PfghM6F8nqAUuSsqY6zvzEeC01dzpevRv4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770161; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=eehZki0ql62hvZ2C+jrmey6PmeP1qu8tee4Gn+9okFNsxEdYiZwfjPy3/DID1SXYtG2ZruZPuSFSMkyO/8P9Hz/Zwj8rBnDYkfwB2kBqu9opTdeP8yORZg7aNbQCpsM2Ks7uE6Pz7f1KIPBRjaf6k57Kw/KYP+cIC55Uin+aluc= 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 1642770161295101.46342715369212; Fri, 21 Jan 2022 05:02:41 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso28863754wmj.2 for ; Fri, 21 Jan 2022 05:02:40 -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 h11sm10445354wmb.12.2022.01.21.05.02.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:39 -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=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=TOpeKP4BoJYdtK10hWMWCqU3UH7uVY6QCB2Kud0DH4OmTXDyJIgwZPmaZr2op2zjsQ GqtyCICudW7ndJqDLGxjgX6665YRtvPmqmuvoZYfee5vj7DyFFj/dJCjNHoV/yH86FzH LxC4CovXsgqqd/90/IyJpWuB3AYI/1GVuH5SohpHG2qG9ffhP0nbg09bz94/mbQv4oIz eM7YqoW5S2xuKUu4blOo17qLxq+4/p57ZtQ+wLMc28CttBk2B3cXAC9TLdY1eBdDIFGR jaNS+O8troReLv28iRJFPGrnrrY4HvTWvygJOuvXqJ4y7zcMzy/6Pcv2rckM2jp1Q5v2 LCBQ== 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=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=1XLIYPtqtS/yQZ6vQaT67HdxdGeWEfSRT9hy/BUPy6hMZK64ah8TScrqRlqXqqn1HO Aa9s/8L6h24VjGPUqog/IOqQ6z5DfYkdWJy6gQAlKkaNhqav5xQjhIGeJ3CJg+rF7WZ6 HQrvnNNL9aR4GEMoMXEc4KzCv1ZtnQ676GeD0hUixxpQlaWgRcXFR0OqT5ThtiU/FaGX 9kCubgXRgPRh1XtR+td66slj5qEXwsfrD8JR1UIdCtDn4fXLBqQiQFAH5F4prn+rAmZT yVhuqg0YmjsF4aPXx61NJ0AvJEXuqv63YB3jGpdlAqm+i6JgBS9Pd8UuG7eUR3K+3O+g ulSA== X-Gm-Message-State: AOAM530td9R+8OtTWlZpdKhuZyWHnAmoayvPObeDj1pkexF4bl4svjjx iPNqzU+B4OEmfT1VYAe+s1I= X-Google-Smtp-Source: ABdhPJyq7KXGjlrH/QfYXcdyTTgZT62AZk5ye1TU9uCioxkbCbOhqfU0YZZbrGMEjk72lAAyFgBO5Q== X-Received: by 2002:a05:600c:220f:: with SMTP id z15mr634798wml.145.1642770159613; Fri, 21 Jan 2022 05:02:39 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 14:02:18 +0100 Message-Id: <20220121130222.302540-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770162784100001 The script only include the local qemu.yml for Dockerfiles. Since we want to keep the Cirrus-CI generated files in sync, also use the --data-dir option in generate_cirrus(). Fixes: c45a540f4bd (".gitlab-ci.d/cirrus: auto-generate variables with lcit= ool") Reported-by: Daniel P. Berrang=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- tests/lcitool/refresh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index 033120e223d..25301f2ef0b 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -62,7 +62,7 @@ def generate_dockerfile(host, target, cross=3DNone, trail= er=3DNone): =20 def generate_cirrus(target, trailer=3DNone): filename =3D Path(src_dir, ".gitlab-ci.d", "cirrus", target + ".vars") - cmd =3D [lcitool_path, "variables", target, "qemu"] + cmd =3D lcitool_cmd + ["variables", target, "qemu"] generate(filename, cmd, trailer) =20 ubuntu1804_skipssh =3D [ --=20 2.34.1 From nobody Sun May 5 12:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 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=1642770167; cv=none; d=zohomail.com; s=zohoarc; b=daUeWTgsba+y7siSg3DnxqPaqQv6nxaYc5OSzXLYgYA5VdSMQwSIR1eyhaOa3cb+7PKY6x341ivhEcYJlpyCTEL0dTlN173gzanJCmcKRLJOf43/qLsWFApVT9g11Y0Ngqu17ZbT9AvS8ShY13lUC/W9/o8gv2niJ86nXd6O2xw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770167; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=i+5mSgrh+J+IV6g/ZeXv+u5iv86ELgEclCbVhEUHA+o=; b=UkNFX7FGwsaM9qML3g2jFyTIW6EtgWj77oyYlGNN9E/si+ncaOWln/syQbpF2FwMPiKnqdrsdEWvunFlDo20dsluRcYOmE4Tj1Kxkw35ZBXRTuFBcmKGHLi9vDNfMGzhd2O3RmyNi0f5WEaPjscYVffDziwQyQpRyg2HPj4YwX0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1642770167225673.6424683173037; Fri, 21 Jan 2022 05:02:47 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so22210649wms.3 for ; Fri, 21 Jan 2022 05:02:46 -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 t4sm4806473wmj.10.2022.01.21.05.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:45 -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=i+5mSgrh+J+IV6g/ZeXv+u5iv86ELgEclCbVhEUHA+o=; b=OMHV9YLndUHqGorup5J0SoPkg4nNQs/WHWiBTMV+ReA3vYT3eJ/VAQ+9/7Fh0Vfu+m Zs3/t8dYTodUPfArCJ9eFU/G2nYSrrRz03b9HsePe+6OaQMf98EPNVTYBCgrmNPFDdLU RqqyF0fcmXH/quVaUIg7KZgmSGQ582MCe3XUmMVVQobNlPyQQVqvDjth3/qTk+T6ka+8 RAmXKVtpPSzo9rcZGhfVwVHGiQiew9h7bLZLfzdGAMY4UJEqFyc9Z2fy9oQwHWm6EXkd dwRucYu3wDzjSx/OZCEcyyHZACIuc3/sOaF4QUPNYjBe6JNYVLe6U/HW7ptJ3a2T6t5F Pa0w== 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=i+5mSgrh+J+IV6g/ZeXv+u5iv86ELgEclCbVhEUHA+o=; b=RQmsJjuLCTmyMyHakabRh0ImkmP+OUWipVSSqpA9Zw4aMMayddtjHb5Qfit3XTO0Zn eysvy5XkBj5cnxDcfvUubXUmrMbS/Y40w9SiN2mrva98d+UJFiIi2Y10NJhVQ0Zdwt9B 6JYgjisM4s+JXxjl95QeeFw3C6ckJDbjB75T04CRZ/exKhRdW3+DoYPsMk3/z8zW9XwO AUf5A2f62vGJ2vxTxDTDpb+xj1gKML71FCm4qbO9g3Bosqjcgx3op6Y5Bj06sO8NqFiD m/gM7UsMceJnzipQ+BEmVEiJPedlNVp7So7n235n9r1LxDwv6/gLaT3rzm+msyba+GPm q8iA== X-Gm-Message-State: AOAM531CHc4T8I8k7984Iff+L0qETifjS5MWUtOZmuW3jDAOzlJ74bRQ rUfC4taqik+mkV7YeuwP8nR2vSvTYEs= X-Google-Smtp-Source: ABdhPJyiPi+kkO9vmoyaHAsmfbjj95B2QpzVBrM37TlwFywVKdrwmP/d8P4/FwgyQ51+q1Niw5cSHA== X-Received: by 2002:a05:600c:3544:: with SMTP id i4mr662178wmq.21.1642770165480; Fri, 21 Jan 2022 05:02:45 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Date: Fri, 21 Jan 2022 14:02:19 +0100 Message-Id: <20220121130222.302540-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770167716100001 From: Michael Tokarev For a long time, we assumed that libxml2 is necessary for parallels block format support (block/parallels*). However, this format actually does not use libxml [*]. Since this is the only user of libxml2 in whole 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 introduced in commit ed279a06c53 ("configure: add dependency") 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> Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 [PMD: Updated description and adapted to use lcitool] Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- meson.build | 6 ------ block/meson.build | 3 +-- meson_options.txt | 2 -- scripts/checkpatch.pl | 1 - scripts/ci/org.centos/stream/8/x86_64/configure | 1 - scripts/coverity-scan/coverity-scan.docker | 1 - scripts/coverity-scan/run-coverity-scan | 2 +- scripts/meson-buildoptions.sh | 3 --- 8 files changed, 2 insertions(+), 17 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/checkpatch.pl b/scripts/checkpatch.pl index 5caa739db48..5e501110601 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -307,7 +307,6 @@ sub help { qr{target_(?:u)?long}, qr{hwaddr}, # external libraries - qr{xml${Ident}}, qr{xen\w+_handle}, # Glib definitions qr{gchar}, 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..." diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh index a4af02c5273..48a454cece2 100644 --- a/scripts/meson-buildoptions.sh +++ b/scripts/meson-buildoptions.sh @@ -58,7 +58,6 @@ meson_options_help() { printf "%s\n" ' libssh ssh block device support' printf "%s\n" ' libudev Use libudev to enumerate host devices' printf "%s\n" ' libusb libusb support for USB passthrough' - printf "%s\n" ' libxml2 libxml2 support for Parallels image for= mat' printf "%s\n" ' linux-aio Linux AIO support' printf "%s\n" ' linux-io-uring Linux io_uring support' printf "%s\n" ' lzfse lzfse support for DMG images' @@ -188,8 +187,6 @@ _meson_option_parse() { --disable-libudev) printf "%s" -Dlibudev=3Ddisabled ;; --enable-libusb) printf "%s" -Dlibusb=3Denabled ;; --disable-libusb) printf "%s" -Dlibusb=3Ddisabled ;; - --enable-libxml2) printf "%s" -Dlibxml2=3Denabled ;; - --disable-libxml2) printf "%s" -Dlibxml2=3Ddisabled ;; --enable-linux-aio) printf "%s" -Dlinux_aio=3Denabled ;; --disable-linux-aio) printf "%s" -Dlinux_aio=3Ddisabled ;; --enable-linux-io-uring) printf "%s" -Dlinux_io_uring=3Denabled ;; --=20 2.34.1 From nobody Sun May 5 12:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 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=1642770172; cv=none; d=zohomail.com; s=zohoarc; b=gvMa1eDR60YvIIKZbAD4hCx7MBAuB9EULbereT1gzJs8SThKN6v5mPxiz6hhE6v6bazvn7m60mV1znEKfpLffXY8+43qkO0xSo0/LJC76TJx0/MojxS87tAQmelEqKYjkXDLmaCfsbzuqKoQBJUrCgKlbcauAZkeaecUJnZi5E8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770172; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Ax/7NiIHCGiGYhS7lLxeODyQTDJ249pSSmdLAFaXTK8=; b=PVBY+UuoY1iw/xBaonDudts90K6tNSSFO9luf3CrqPqj1bmJYKT2j14D4nbJKJxykIjHMoI4rWrBAhPVpZZRLTSn5w7QtjQvz0BjpCS0KFmwguw9v3R5eKlALGaDdvcgPblBiWsVtprwTB96U6hQCcDpF7LTZnNZw1B16gD/g/s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 164277017209229.469508836047908; Fri, 21 Jan 2022 05:02:52 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id c2so17855311wml.1 for ; Fri, 21 Jan 2022 05:02:51 -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 u14sm6737989wrs.17.2022.01.21.05.02.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:49 -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=Ax/7NiIHCGiGYhS7lLxeODyQTDJ249pSSmdLAFaXTK8=; b=gLM8AfoyZ+kDkYUCEqxcR6imneef0dTW7T/6888IWaecnPMz+OlMChhf/Cs2F7R1lB DWvT6f9vWbwSy5XdoR3kO8J/J8baiGSwRr8n0d+DWs4bgsuNJzUcst65GC6AayoJC5BB 43QNfk/RT3u6eq5mtnIorZlfpilbaw3ESrPdjbzKe+HMKy7/gjNWraoXf8RrfwwKXo1y O7EMHxXK3vWrMoGNJA1X2e9lYStTz6Bqb95vq8LIuNEGfS2qL5TYR2ZPZaZuXvQxeafj yna0famFYE1MdpanSOJChmdZaDKxHVtkEScX93RLIxRGNgq7ZihMCLRe8+3V8e2AqE48 hgSQ== 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=Ax/7NiIHCGiGYhS7lLxeODyQTDJ249pSSmdLAFaXTK8=; b=saAMXPstm0l8SGHiG2i8rQHQeLI+Lhv0Oz4ceR3KkYlt94yFPOuXEIwOxxCOyVyP1i feVTnk8gjO/ca6wUkop9+jwqVagE14s0UJgMkUG4BA98oV8KPZEySeuhIjhMyJ2rpZSr By5H9eN8b//Lfk0z+ZHiynVdvvbRcfmHzn40JJxLvM8UvcGtnFT5Sm5cXV8Xf8AilZ2I ikOBmATxscs7/xG+qAH8X04zCUJBx1MjXUvM42MokqqNLoWXgr2WlyTQ2hzQyyM1xLFM KVYmzCK+vvGTEo+xcUpSZVf4NK4jx43Nh6KXAl2SypDsQBxYgForpCx8XSYc83h3QtRy IvXQ== X-Gm-Message-State: AOAM531xgLET1GT/mnBTr6dTCUj/qykuMVadoHnOp1i/+mSVzTb0g9P4 FQxea0pUeQT+RxLgIS8Y5XM= X-Google-Smtp-Source: ABdhPJx2v8Fsk6r+bkVzqjvL/x2n6pDQ+fwXICUqxMDXewukuuY93caqjPnfco1BFKCVL6kqmb16jw== X-Received: by 2002:a05:600c:3acc:: with SMTP id d12mr666193wms.85.1642770170319; Fri, 21 Jan 2022 05:02:50 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 5/7] tests/lcitool: Refresh submodule and remove libxml2 Date: Fri, 21 Jan 2022 14:02:20 +0100 Message-Id: <20220121130222.302540-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770172875100001 The previous commit removed all uses of libxml2. Refresh lcitool submodule, update qemu.yml and refresh the generated files by running: $ make lcitool-refresh Note: This refreshment also removes libudev dependency on Fedora and CentOS due to libvirt-ci commit 18bfaee ("mappings: Improve mapping for libudev"), since "The udev project has been absorbed by the systemd project". Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- .gitlab-ci.d/cirrus/macos-11.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 4 ++-- tests/docker/dockerfiles/centos8.docker | 4 +--- tests/docker/dockerfiles/fedora.docker | 4 +--- tests/docker/dockerfiles/opensuse-leap.docker | 3 +-- tests/docker/dockerfiles/ubuntu1804.docker | 3 +-- tests/docker/dockerfiles/ubuntu2004.docker | 3 +-- tests/lcitool/libvirt-ci | 2 +- tests/lcitool/projects/qemu.yml | 1 - 11 files changed, 11 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index 9c52266811f..79469deb4f7 100644 --- a/.gitlab-ci.d/cirrus/freebsd-12.vars +++ b/.gitlab-ci.d/cirrus/freebsd-12.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gs= ed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libs= sh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p= 5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py3= 8-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio s= dl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrender= er vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lttng-ust lzo2 meson ncurses nettle ninja ope= ncv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pi= p py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2c= pio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglr= enderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/freebsd-13.vars b/.gitlab-ci.d/cirrus/free= bsd-13.vars index 7b44dba324e..331791103db 100644 --- a/.gitlab-ci.d/cirrus/freebsd-13.vars +++ b/.gitlab-ci.d/cirrus/freebsd-13.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'pkg' PIP3=3D'/usr/local/bin/pip-3.8' -PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc gettext git glib gmake gnutls gs= ed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspice-server libs= sh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle ninja opencv p= 5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py3= 8-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio s= dl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglrender= er vte3 zstd' +PKGS=3D'alsa-lib bash bzip2 ca_root_nss capstone4 ccache cdrkit-genisoimag= e ctags curl cyrus-sasl dbus diffutils dtc fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 llvm lttng-ust lzo2 meson ncurses nettle ninja ope= ncv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pi= p py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2c= pio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredir virglr= enderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/.gitlab-ci.d/cirrus/macos-11.vars b/.gitlab-ci.d/cirrus/macos-= 11.vars index 613d1373c23..08183f8793c 100644 --- a/.gitlab-ci.d/cirrus/macos-11.vars +++ b/.gitlab-ci.d/cirrus/macos-11.vars @@ -11,6 +11,6 @@ MAKE=3D'/usr/local/bin/gmake' NINJA=3D'/usr/local/bin/ninja' PACKAGING_COMMAND=3D'brew' PIP3=3D'/usr/local/bin/pip3' -PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= ibxml2 llvm lzo make meson ncurses nettle ninja perl pixman pkg-config pyth= on3 rpm2cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo= usbredir vde vte3 zlib zstd' +PKGS=3D'bash bc bzip2 capstone ccache cpanminus ctags curl dbus diffutils = dtc gcovr gettext git glib gnu-sed gnutls gtk+3 jemalloc jpeg-turbo libepox= y libffi libgcrypt libiscsi libnfs libpng libslirp libssh libtasn1 libusb l= lvm lzo make meson ncurses nettle ninja perl pixman pkg-config python3 rpm2= cpio sdl2 sdl2_image snappy sparse spice-protocol tesseract texinfo usbredi= r vde vte3 zlib zstd' PYPI_PKGS=3D'PyYAML numpy pillow sphinx sphinx-rtd-theme virtualenv' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index eb2251c81c8..591af43d60e 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 @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ @@ -109,6 +108,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..3abac7a8b13 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,10 +69,8 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ 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 60207f3da38..1d01cd94405 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,10 +77,8 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ 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 f57d8cfb299..1b78d8369a7 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 @@ -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 0ffa3c4d4b5..003ee2cfedd 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 @@ -89,7 +89,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 4e562dfdcd3..8993d2d9e05 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 @@ -91,7 +91,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/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 diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index ed5ab1407a9..de51a2f1dd4 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -63,7 +63,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust --=20 2.34.1 From nobody Sun May 5 12:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) client-ip=209.85.128.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 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=1642770177; cv=none; d=zohomail.com; s=zohoarc; b=IaTdAUwemGi04xpFk3XgShLuV/+nbY6TJyQXJjaJyMs6Rp5lEkygIXZIHlhl+/V4IiUNEjRcLqb+esQLzPHkLM8tk8D/NvefEQMSa0BF8KYbXXjKA4N8B3aCRBtVH2JETpJxuYCjc/ty0vjXTcxB/gLN6J//wKK5fzENox+aFUE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770177; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jmhL/OO2/CergPGLZmyF9NCYKTuS6CMx+Lqk/P5jTQc=; b=JSu3uH2I94FdeHG60WAJ55RuAOKU9Fh8Rewcho28MpibOGJ4jt9AGfdWnd0P/PqM6pZRBtmofhBFSxdp942PRZkFdqhcoPDeWkQrr0ynYkiJ7xtYQEtibux7nM5dxMliYwWxQxfGrsFSeMona5fWJLF1XqBtXYmQzoHgdX/yDXs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by mx.zohomail.com with SMTPS id 1642770177119749.3162815929584; Fri, 21 Jan 2022 05:02:57 -0800 (PST) Received: by mail-wm1-f48.google.com with SMTP id az27-20020a05600c601b00b0034d2956eb04so22203959wmb.5 for ; Fri, 21 Jan 2022 05:02:56 -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 l6sm7346022wry.75.2022.01.21.05.02.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:54 -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=jmhL/OO2/CergPGLZmyF9NCYKTuS6CMx+Lqk/P5jTQc=; b=mndCJDuhhu0qYDXJBYqSnD+T1R17xsOe3e1DGcsS7JAB1wrgP5oylx4J8x0r3k6kuD 6M+YrwVEhLxS/7sJeffrgai/GTnR5ddtPKUOk5wa7VZ9GhtKgHI23iQ2bhEY7KJteOnG jjWZkYeN9HjnTXhr1sFGpXsFIloqMF0LC4IKW/ABnI71ak+DtSGBA3wq9ngqjF1oVGhV kEhfYdzvhUifGzzhlXxyAPgSkOwLsCbFLwSOL5jLeht7TmMCcS6QHuNHTCaXxDQ9RZLb e83l1Jmw7q500n5fOwKnbLrJvR6qX2ZREcU44Dzm8cAhexpkoO4hR8DneK0EE904FLhJ uNbA== 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=jmhL/OO2/CergPGLZmyF9NCYKTuS6CMx+Lqk/P5jTQc=; b=u77BOjAkICjDzTqOk97zrb6ccwNZQl/RQq4VwEvr01j6mZ1PwAZx1gEbD7PnrBIZuR 9L1w1vYw19X4W39CTRZWkj8vJdxenuratvXWfWtOoRoV+8Hs2ORzF1xjEFW239ryg6xt slB2gbin+aM36D4TVgsJBM3cpYXgjbcH4s7iTGnYVngfFtIRo3vudejsJlv7DQWHmF1r l+3jfYrqJXVVuOJHoyEd9duhHPxpNeyP7bL5Tj0zEcX2PTdYHekxxf0XfPrXimCwlz/V VQDyDZEpWv+f2mLbLTddxvW2jeEHN+fjZqhLkteWmBVoxEsi+67cNvqooZk/cWLd2AIi TxcQ== X-Gm-Message-State: AOAM5328I4wey1ursHohgMTjDbgmxP1hKPRYX3avZyNmkSuEr6319D8d 4vEhCzf3cnP+qYILgBNOsF0GW1fY1aQ= X-Google-Smtp-Source: ABdhPJzLi4kgwKFMXEhHB4lEQ5+FWStB0kaVnTD5iDFRwa7N1S3IiOlBEwxDYXk/SnUPShlAWATbdA== X-Received: by 2002:a5d:4605:: with SMTP id t5mr3917615wrq.517.1642770175280; Fri, 21 Jan 2022 05:02:55 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 6/7] tests: Manually remove libxml2 on MSYS2 runners Date: Fri, 21 Jan 2022 14:02:21 +0100 Message-Id: <20220121130222.302540-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770178210100001 lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=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 From nobody Sun May 5 12:56:44 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 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=1642770181; cv=none; d=zohomail.com; s=zohoarc; b=KgKDrqV9f8qbePVOAPvtzGZU4bBqY+4oGY+c4PX52roDGVTd49sA/vmg09ODjRIu3Gm7Nlg8ZYeW4EPv9BIzL6vrZqEnvcUIVqTfgkqLgAS9c1jemqICPfUjcgJEjFkiti63S7lTG4HLgBpnAWc046FRUBblz9bxHBZp5FTbOHY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642770181; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=BSvX07XSbcj+uZJduxG3G9nv8iqDtt86eLgBT/T23uA=; b=X9uXXvBbKfK/a43aKC+ePZCi+6ThGSzVJKisEDO7cC3lcIcUrjiMnzM7jNYbN7QTdjXpEVMHQmC7G1YPZDZjgEi0Fc3OFexMPfjT89TGohlh2Kp8mEBngVW4U++ROXCuYrOv0eCeGqzyVu73Op3VuIkV8GfXdCXVL7Go7E6JYkQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1642770181967741.9134780617972; Fri, 21 Jan 2022 05:03:01 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id n8so17803313wmk.3 for ; Fri, 21 Jan 2022 05:03:01 -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 g30sm6059436wrb.29.2022.01.21.05.02.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 05:02:59 -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=BSvX07XSbcj+uZJduxG3G9nv8iqDtt86eLgBT/T23uA=; b=LsVyVpARggJnq4Ych+rYkhIjSEmyvj2Q7Cld425/GY8OizCSz4aB9g0rtin+1RR52r C0IC08hfC2u+fHQk/CSuJp1rRtJQ26VtlsGcB53QXlF8PWswNuUY4CcKacqP4PKQbQFr JLE5Y94TgSfYMKwj1j3a1LYHzVySz3MfGaKEt+9YfI0UNcj5qCHXdab/mWHnBEr4313X iCSTOc9XP1/vJd3fV5R1SQVXq9+6kt00Jp1YIUFrjxOKpfT63UNdtZ0y0lidyuRe1cst 2Q8tSQtHPFxX0GXC9odti0nyT3Ky12eD1UYyvrdxAm55aYXNH9fbahJdrD29M40CJ6tb vtWA== 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=BSvX07XSbcj+uZJduxG3G9nv8iqDtt86eLgBT/T23uA=; b=B2Uv6lnXp/u+Izq+ST2C5EwaGM0ya+U2aAYMTgC1ngisEJluzUXAAIQSd2NRnkSmA/ GZPL7Yi3Ea2QhWGU/ml0159xHHqu+QGe5gW8ZQm57E8R1zDcUSelR/MAMT367d01vhwG roJjaV+pT44GKqBxkkXlJLNEbuB53Fr3ooEG24y0D55osEIrSECk8/LJG/gHXYzTdL6u KsK31f+17iQLacnflFH5iP2W4X03S91UhyySWaQKvFOXQ3744RYJJsyhGVpsOnUBX+f0 zzoy60i2Zs9k7mN8TkCrhKnhxXVLZVGkGCnyw437pMp48TbLYMSbh/Fh+RwbYCef4/73 d/og== X-Gm-Message-State: AOAM5317JQydoBgffMZFOEbBeKbHrBQyhV29YhLwFe8zl7f6bes2kj+C 3xuRvSx2lStf2DhhWESe80k= X-Google-Smtp-Source: ABdhPJxV1ewJntTVOCHnNHc9reDOxoHKn2PvSu3I3vQr+Vv0ptqsYHeHfAwErP2SF6Ko8CajYhtTfw== X-Received: by 2002:a05:600c:3c92:: with SMTP id bg18mr700952wmb.106.1642770180277; Fri, 21 Jan 2022 05:03:00 -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?= , Michael Tokarev , Thomas Huth , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v5 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Fri, 21 Jan 2022 14:02:22 +0100 Message-Id: <20220121130222.302540-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121130222.302540-1-f4bug@amsat.org> References: <20220121130222.302540-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: 1642770184036100001 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 Add the dependency to lcitool's qemu.yml (where librdmacm and libibverbs are already listed) and refresh 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/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 003ee2cfedd..699f2dfc6a9 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 8993d2d9e05..87513125b8e 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 de51a2f1dd4..958868a6ee9 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