From nobody Tue May 7 05:49:52 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=1642779703; cv=none; d=zohomail.com; s=zohoarc; b=PpQxdGkDwW+Hz1rbFSQMbAl4rGHZu7MzUVyxwiye1ag6Q1rIrwOfRxtLHZqmeBvh0s8bSqCpvKoISOyymtt/s6NSrPEyKmxKwNZEOnnMeWFvXqiAQBnvuTjVPiX8CoHWhrjlD3ORWARiE68kY0WIRr2mMLqCSaS/On3M2L6S0wg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779703; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=qHVrZYilprbADKL6sDkzZ5rkDTLaol2IUVJ3O0h2GR0=; b=d13CQfz77fT/aFzdHnaFRXWtUou+nRTmis7E3AIgDLBJe0wvaALqar0mzoCxP+BRxp9NhbbS6zUeObRKo81cHrcvc2u7T/nhQdfMKKwl1ssTWIiTzuhqS90aJ0MqCvT/5wbWmDq63hAinmzz+IU2gZIxiYv9jKoXgpOi1I4BbBA= 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 1642779703332551.6670807415097; Fri, 21 Jan 2022 07:41:43 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id c66so18438689wma.5 for ; Fri, 21 Jan 2022 07:41:42 -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 f10sm6607140wri.50.2022.01.21.07.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:41 -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=NJikODvwK+s3FfOKIBhzVEryyZtVsTdZv1sYEICrKQf2TFqr8kvnJxekabx3FoIYd5 SBwsRVe4jZMkUQ3JkfsSPKNaIYj/Cx+GyrD1I2nOy0IjVc4Le1YXMwZhUw3DJS+lJrf2 uH5I3zJsvrE2whEGMJ5rNbZOjuhdDxGptFR/+s58BFO/TvXsKnCPzq0MCPNSY0hU/E5h bnQg3qD+ZJrnxXa0/vDhSL+R++Yt3f+A4sMw886ep4JXv9BNbm4BA0aR0swKSOQYy6RZ PvGsD4ESrMvQ9uw+v1JBdkimAvWqbOEkx5nlroxvvntMBt6T2KyXZZRjfWM2Fqr2bhLs v40Q== 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=mMrYx11kKW6YRpNa6/Dizv6bVZGQ4LV/acs/7G3jj0o0UiGCo5OrsK8TsvQgglNiMq s4Cp81hTUiraWIE9yIlK3BhHONPAsFayFeHwn0beLajDmV8k0ZXz5C4ZDbkzpJQyfyMe ykaLDDOl8o8iyvGK/lZ5p4GqJuPWibL1PP8IdxL75NlI27+wyEgtnZ00lNfhtCUhWlAl NjJZFsEdVhmeQul2ROnvlA0EkxPb4D3C7vhJfjmwH5fqbhgYaktZ/6pvulocBCTszCvX eL0Epi26TKtBD0QVw/DOzXVDsgof+zD+S0XPmhPEyjs4WmXhu7Hy9W+D84wcp/00T7me yEWg== X-Gm-Message-State: AOAM533hfos30l8RWazHBhJw1ItWJs4hm/izU0pSYyQ7mg2Q0O6d+Lca alcFvxlpqsLIwIm7POp4TLo= X-Google-Smtp-Source: ABdhPJzH365UhrzFIFDzweZ6bvAFcLAGOAmrOhv0hWf+YSXZY3yBZv03HXHreD0EEz/qXb7rvz/x8Q== X-Received: by 2002:a7b:c747:: with SMTP id w7mr1295858wmk.54.1642779701641; Fri, 21 Jan 2022 07:41:41 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 1/7] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Fri, 21 Jan 2022 16:41:28 +0100 Message-Id: <20220121154134.315047-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779704590100001 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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 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=1642779708; cv=none; d=zohomail.com; s=zohoarc; b=nImGMDaiscD3KUO0eoE1Xnt/8Xi1A3SKRw3Sm2KCLPIZZd/1A/jvdMbjEamaamqSZSuJFc4gkOi4RatY6ii6UNtvyQfeDdKL4/Zvef1okliUImuGyjoNJqHLBeUm1rTN801KkYCKpcn0SYGDxohL5yz/QziK9YYLswQ9cOP1bwA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779708; 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=b2+cV0iXelx5AYpb7+KiWLBV9UMLCFvACF+BxXyBNA/BhYSQhZELuIna0H4pWg7aepAQilSkm7s2rApuSqEgG+y6sj7OXca2x89i1doz3GVxzykMzcK8E3w3qApLwPZCjLAs+V3u5+eofHmAY9oK8yxOsgg79qnD+iYa+OjzUrM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1642779708128171.71927220848988; Fri, 21 Jan 2022 07:41:48 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso22908629wms.4 for ; Fri, 21 Jan 2022 07:41:47 -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 y6sm4980371wma.48.2022.01.21.07.41.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:46 -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=OwV1gvBqTdwAkPS2IgqWxE9JZPC7ke30HVEslbT8y2OzSMkM59vvcXQRwLwX+QsHUc kdJEdJ+oys65VhQSfHdcd2Vcyej8saJADtT4gxf6yiEZ4MD2JZk8djsbJGbjFgFG1Q5D DBKWdANgOQIXid2MQQtDJSzwkBlKpUf1LL+uubC5siEnhAU3Pg/8g9ZHOUbW7SdGF9YZ Mn6Pcmb/ZfVEnjxuUTp6lL+Dq0xAW09b4K7IOF41byARq73ruD2Vw+4Q50N7/xSiFTHQ hOUyFlyuL95gxfB8Q+j339Of8LkNE6I3T0fD15AUfSyT7TF48JglGWQXBZcUojX4liD2 s5UQ== 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=olRaRhvUVdwzOGwXiv0eKbbAGqY/FpYP4dqi8a5kKi6EuS/gUOrE1BO1HKimYPmzSd C6ElB5heJ+WciUkahQY2UDhCXStwqFaFFBj0Lb5hjh3IHmIvotRsrlVn7N3VhGjNnb/V jnmp0lf/5/p6lwOdFrdWCA+/EvqnhFeUR1fS8bV9vden7QW7DkzUU1/xUi9L9cTqR028 3uGv8TzQZJ33AMPG1FnRAKvgKsOgzZHBEg8biB/TwtQJJzc4OiRubfkftGEGOM7JFVMl aZbXhwpMnAiGK8S5OjQeBdGiB1mLd+DavRQH3blR/vTz11cTVQRUTUx5X1syHEpAiRfy jfxQ== X-Gm-Message-State: AOAM530bZdkv3+lceKmNEt92w6MPiPS/HGTw8NeREoVf5BECV02ZQeqB pPYwUKOSsZuyNVlWukem20k= X-Google-Smtp-Source: ABdhPJy3hW/VwXx/6LQAOytNOO1qE/9r58vKYekqJKKfCEjI/zQFG1PilcPuQsmh6X3u5TL16MV+hA== X-Received: by 2002:a1c:544d:: with SMTP id p13mr1231723wmi.97.1642779706370; Fri, 21 Jan 2022 07:41:46 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 2/7] gitmodules: Correct libvirt-ci submodule URL Date: Fri, 21 Jan 2022 16:41:29 +0100 Message-Id: <20220121154134.315047-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779710712100001 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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) client-ip=209.85.221.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1642779713; cv=none; d=zohomail.com; s=zohoarc; b=KwwjAFxq/wtGavwoigEH66N7iQtD8N9zoq/X2BuZUCtNXJQXnGTL0Fz5OOY89Dsj/LY9zR5VJeFG/yrHS62pGyE3qNaeBeINezsEqKauTwuvzrdd+2efxvBU/vgPzrVFDtB2Q6VH3honq8zcmjVNS5fh9TjeYAyi0881t+y9rEI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779713; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=cBDU+3JrTU75lin0/wLRR5T+gOtEZn/3PWzO4KRlcqanIln8YtYadSmhFR8EC5D/Jp4kXX8/C71QuY9teSRskN6wcGjSXVQJVKXRx4CKocjOX4OtgJ0HK9TmBPAVw+7LrvSWSzQGSEOCswn3w6hf8IjY4lsdM48ek6W+KlsBTf0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.zohomail.com with SMTPS id 1642779712984598.2875366491357; Fri, 21 Jan 2022 07:41:52 -0800 (PST) Received: by mail-wr1-f51.google.com with SMTP id ba4so390950wrb.4 for ; Fri, 21 Jan 2022 07:41:52 -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 g17sm15468482wmq.9.2022.01.21.07.41.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:50 -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=J+aux56hQAqZIq5SUPaFmor2vL8WZ+uu2piiHOmTnimEo51SJDE9bxtfSdJWdLsXXa d8hHLVhlRfIkof/EMgBKa5sIUmPWotstlLR8FwkRBHCEyJO6KpHVULKJo5C8AXLjN3BU U6/fFOM67cbuqSnK1sTegFoUBxHb5CIXcFpAHzbOhIGTlqPYYzh3NSk24kL6odP4Swrx PwKwG7mmnAvhyirsjYgIIkvcQx4ACs82HM/5YQbx8CyUYt0MozPpAYCAvoC6vMa/6yhU /MeBtuM9FIr8RCkZwN0Ba3+o6IYHxjE2gRoydl4+lIwtCcFkfJdv+LnqGFstDI2QM9HI 9PTA== 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=rS6osYWKpW1mvDunqrRS8E5HUdUuQSLPAX5qinlwYTCJ1+ULle4aZiFzjjznhhqzS+ iDuCFh6JxH+H9Z3CfXRY5YjLxS1qeJ8CH/i0wyA5YiYuRD8DutuWvUs/beb5NRrj9KXS x0gbdWjKKGpSNlNltUPZDw7n37+2n3xgtSg6PSpJKwMQcKMAF1O4HEwpdBPus6bVKPfw 5YDpxpaRtX/iPFaV8QwcbIb3d/gMAwqS6ztDxDKnAy/EPOXfdZLVrJ6FcyTilFfxlDMa BmdZQwgrPiFSC+sfwwgKXul2FdwFLOrONJHeFm0riB61QPF+5E7nGLGd65lhO5kcaCjy Mdeg== X-Gm-Message-State: AOAM533obfpgI95Wv0jZj5l28mTZkGWI+Imj/yPpM562Zd91BOrx+t9C gV/cU9lWcq82Tg+7CgqFJKo= X-Google-Smtp-Source: ABdhPJwjP6sv73FpGoknIyxzcP3yo0H0lsyrey3X4tpmfuN0epQa6J2FEUP7jBrnK4wb78qDZDqZgQ== X-Received: by 2002:adf:e48c:: with SMTP id i12mr3459790wrm.546.1642779711303; Fri, 21 Jan 2022 07:41:51 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 3/7] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 16:41:30 +0100 Message-Id: <20220121154134.315047-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779714593100001 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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) client-ip=209.85.221.50; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f50.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1642779718; cv=none; d=zohomail.com; s=zohoarc; b=QAKrQhf/b7mRX1O/+n8H+GdCxcnZoHrX3M2pXcHiA9OIkYeMjc4BLMEYnQppwOhXeuvasD0nECXPoA3q+QihlE/uQ5SauYTUYVTEXZStm2GsFqd2CpiEDWj901ujIPEiyPGuRZ5U2liNhIt47n8sYIpeDmtU0THhVNhxsujyMko= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779718; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=wRMk9oLd+X58jCruqv6bDjXuXptPpTM6cy14Pp19F9Y=; b=k5KVZISq9kMSR1wlsgdbi3OmTOZU7b3gyTy/vjabWKcpr+eDuE8YHLiyB0NcqUNpIJHPYa2dPAjN3FuareOM2R1GRMhGtDdQGnwEIHRVIsjOkY+cU9mg8Ls9vEC50Tksw55InQZabrcNthzUhu0s1g2MERATMbXpcicuLcNlyxk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.50 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mx.zohomail.com with SMTPS id 1642779718085551.1659029167757; Fri, 21 Jan 2022 07:41:58 -0800 (PST) Received: by mail-wr1-f50.google.com with SMTP id l25so394720wrb.13 for ; Fri, 21 Jan 2022 07:41:57 -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 y6sm6746767wrs.108.2022.01.21.07.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:41:55 -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=wRMk9oLd+X58jCruqv6bDjXuXptPpTM6cy14Pp19F9Y=; b=dQUyRqMbfFM6Bj9evZP+9mbX4a3l5g/b0rJbUqmnKrsyTOdTNJb3LuEanBad//d8t6 LY6u+Vlyiwao+HEnxfyiBa3TiBzuu3l+yrUp7YjHh94kuDra2RfQl/7EvErHoN8QXczD 8EcjPj8WeCSQixMpeVcRQFtsXAGESPLmUL/UJrBDvRPCGkcAhr8DQ1E3RDOYSXCKqlSi JppS2v8quu1kutFgD6VbYUcLdiEEtwJ+lH0XbESyq5eqiGtvVLUjrT6G+cMWPNj4TkvB rgPa1pV9ZX+iStLHqXPWLGD6lJQhi2Yn2LOVdr0rT97YGCouXpUjcp2/fhCg5tLWN/sz VjdA== 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=wRMk9oLd+X58jCruqv6bDjXuXptPpTM6cy14Pp19F9Y=; b=IsXE92iUr7CG52z0lNZbgha1Uwv414hjAogNa4SEORgH97UARgPbM43vABbntK0Bv+ D0cYBbrbhctSyIumLOniFJqXGVnyYpnXH8W+tc/uu2zyCmUuEBFwTa+CRl5QyDHmoowh N5nKMe4RyB3deaTU/9BX7hpAn3RS0A8u/QlIWu9hyUrzrehz4eI0BEQDbPXiaKDFDlbB X39WEjXhNud8eM+yrVduORSfebd+Nh1x4eLPl9KnbuxnSyqhGlpnlPpF7KJRz15dKLqo LcgUQDLma7nn7ce8KZCAPB0Eyk+3aAEwEi6GhtNonqdTg0vx1DKzMkrNN8X3pT1EJI6W WcLQ== X-Gm-Message-State: AOAM531MlOqisZpGzzXCqUJZG+4RrbiTcL3NpILuXYqyIT8DGvZfktRx +F8YvO0l5clQscPEf35Kje8= X-Google-Smtp-Source: ABdhPJx2r7Hd+mu3rwxcY9Zr9bzp9NtXfMbfufWunyD8Co/+sO5rQDQ6hZfh5Dbr8+GG5m+GR4y1DA== X-Received: by 2002:a5d:688a:: with SMTP id h10mr4407785wru.415.1642779716278; Fri, 21 Jan 2022 07:41:56 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , Stefan Hajnoczi , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 4/7] drop libxml2 checks since libxml is not actually used (for parallels) Date: Fri, 21 Jan 2022 16:41:31 +0100 Message-Id: <20220121154134.315047-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779719345100001 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 833fd6bc4ca..51e3090438d 100644 --- a/meson.build +++ b/meson.build @@ -451,11 +451,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', @@ -3491,7 +3486,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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) client-ip=209.85.128.53; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f53.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 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=1642779723; cv=none; d=zohomail.com; s=zohoarc; b=LHEGlZ2YR5SRU1p+uUbBCrVmwuvRTVN4WOjVki2A0IxoYO6NUa0P3+En281IAH7bs3/B8E8gWjxMdiubFlBDeHXwxJzmH+feRYZLFwCKDOc3VVlUjwzDfv+BOkJO3TC9u2OMN8JriuxUFaP2c5kLeDSx8w8CPKBhc1MhdgiIWcA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779723; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5Of3l4u3FiVNd7t/06K1VRlM0oLlSgnk/M7vVzXCwT4=; b=kRLGiZyIli0VHx7mYzdAl3omzNFxv1jp4T8mv8bjOVWYeanBowCH/A4pCd5Wy/k4NMyD80N+7HUShfarIc8VlSTXs6r8gVCSB1qzUVJa/Krhj0en49IAdEyy4LB+fWZxavBdM4g2v6ULkS6wzLo1TOl7//qBRHcDBYVvW8UxPD0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.zohomail.com with SMTPS id 1642779723284691.1093703959123; Fri, 21 Jan 2022 07:42:03 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id f202-20020a1c1fd3000000b0034dd403f4fbso19667035wmf.1 for ; Fri, 21 Jan 2022 07:42:02 -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 bd20sm6242750wmb.38.2022.01.21.07.42.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:01 -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=5Of3l4u3FiVNd7t/06K1VRlM0oLlSgnk/M7vVzXCwT4=; b=oFFLIVtpb8Z5/j45PuAaaLqj876/YB06VGoRsxv+pbAucBA7w3kyntEUfEGFJpQY1i aCmAg7AiJQ+5fMDbchd73EwbytZ/9801pWU3tE0jRDXfojvIfO3CzmCF9Q5gLR0VkLRv g2K+q5/PTw3cP8kJHDsvS+g4A/Z8OvdDbvFSdewyVHUDm676G3JAl9gqn/58lBqntfKq GIGuO1lFouJ0CiKadU5AEzzkezHGBF+j9AiuquwMv/ZmIiFevsLO7xm0EEuu3KtObJWx v1WGO4xCGKyRY5+huhYfEUfuqOnLImOOAYk5K/0yht4foZbIe98ApP6k89snd7jilD0o lT9Q== 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=5Of3l4u3FiVNd7t/06K1VRlM0oLlSgnk/M7vVzXCwT4=; b=wrJ32q2gtjybCEw43BMxAVNxeO+n/M848d/lIWRivzvAnpmt0sGKIn0lpOVp+kxHta sY9xs2mbsyYYcHoVbtMr2dMk+pIzjpMr0X1nbrFaHYjBGjfdEKeNsTLXnR/93qNpVnK+ F3NZTJsiGZUZSHImN2NSpN8xWhnvvp+NPxQt0O2PJ+XaSWU0tw1kjAGXTBTM1i0LcvV+ ZgsCzrChXmEmjFKLlqlZw1jTWreWICo5ve+GYgXhpGLxx2ojkPQSI0TANvPl+IUMn8NE 9stWxn2/JDBVx/Sa5RGr3J9jTZGZygX3kSuaRENHN84xRXy0MmLd2bmUvumaFtQlfMFK 37Lg== X-Gm-Message-State: AOAM532P4dztZzq5WSuiJJYwrv6J6Jv9SlEyJkr6d1SLNQCjvR1cTIZa ALqUwWeLQ8FCBW4WsEM7MoE= X-Google-Smtp-Source: ABdhPJxk+4CSbG7g4u+dlbT+insxSI9wOxmsvAiogYhbHhNio5QkgcpkkZUjO7t48xQ9lex5SGTaHg== X-Received: by 2002:a7b:c94c:: with SMTP id i12mr1229141wml.85.1642779721519; Fri, 21 Jan 2022 07:42:01 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 5/7] tests/lcitool: Refresh submodule and remove libxml2 Date: Fri, 21 Jan 2022 16:41:32 +0100 Message-Id: <20220121154134.315047-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779725029100001 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", and lttng-ust on FreeBSD runners due to libvirt-ci commit 6dd9b6f ("guests: drop lttng-ust from FreeBSD platform"). 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..07f313aa3ab 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 lzo2 meson ncurses nettle ninja opencv p5-Tes= t-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sph= inx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 s= dl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vt= e3 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..8a648dda1ed 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 lzo2 meson ncurses nettle ninja opencv p5-Tes= t-Harness perl5 pixman pkgconf png py38-numpy py38-pillow py38-pip py38-sph= inx py38-sphinx_rtd_theme py38-virtualenv py38-yaml python3 rpm2cpio sdl2 s= dl2_image snappy spice-protocol tesseract texinfo usbredir virglrenderer vt= e3 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..6dd9b6fab1f 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 6dd9b6fab1fe081b16bc975485d7a02c81ba5fbe 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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1642779728; cv=none; d=zohomail.com; s=zohoarc; b=m4yVBhMi3ItvAvK50ohU0fkQItNZD92gWy24VNGvwSek4uZT7bRhjRc5Tt+ffgeuqXP5Ja+8WdZfQoYUxEv5/p03NXLDTejQMsqhikixopLjHXZbgzn5eVLylaVEStdipaxEuOMGuS3fPSiMfl4Ep2orHtDn/I4tx/5x9zKEB9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779728; 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=hRSbGXCViDQ5jI0oG5USlIcdq16SstmQR8ep7VMtQLNGGSxS2h06N7LvWmAhLaBhdrIr5nXnOnjXteaci5/1PF25bGyKbX58rGHeNw4gI9RNAxzeHMaZe2DSjhu41YcUGU4rD4L+E6p8+5a+ErzGA6ERkdIpli5nDT7lXl5/SyU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1642779727993777.3262785211338; Fri, 21 Jan 2022 07:42:07 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id d19so394821wrb.0 for ; Fri, 21 Jan 2022 07:42:07 -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 r8sm6067360wrx.2.2022.01.21.07.42.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:05 -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=egdEub2zlmdpfyXntZPxBT03VWPkwqIrj0sYdpQd0NGhBznI2saFourXf+tWhg8GRQ AzvdZRaUQUYQmUhyDepEIVN5fNJT8XwzkmzUi93VPXwcrzGbNNp4AOa9Xhxl0QciInIM 3hhRB9RDyvDTxkrl9oKD1knuZUU6FN9ck2/c6BCxE+4+6odWTuxe0Sy+Q0RAHgxAkfzm MO6KlDYwoONr1TooLsGBkyYL9HiBPaHDNVTvm3cKJOsFFBmmWLU2S8yPjGhQfyVa+MbX ao8KZm0KFIDDx9qzVZ6uRZUJ8IFG7p3abeIlqhMXtpJEPF+hWHMI+tSgRUFHtdpHpKq0 FW0g== 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=kv3TkrAsnBUKfLICuXx9xbeVgg2BSBKQDfFQYRs0ZkKsYzaXoUN1e68m1o9B/I9rug 0n4D0k8+8hYQXucJVISnaIH94vkzMM4G6XIpapGnKAPczc5ohckr14gakkb062v8MVWA Rri3xlirzbzBL9bMcp5ACfyAYd/9dVxpx2X8Hjv2RM2gCAo8lCiEnJwX4dBMDfKBbyYa 8siKp4RPB6YPgBbcwENWDKnhsN7bbHoBIxX44j0INWjjNd7IRkyC9nlymhM70vMtgaEV yEHEQP8747GzzwS5W5cD+ji6adZfW6cVggy89Ag5DKMsSv7OI5gS0H+Bo73wm7rRbAtd W+UA== X-Gm-Message-State: AOAM5331clltnzoMWQb+0trKvXdehgF2H5HHZhJBrxMvKR1ZS1ibvnRQ cG/s+3hg/CCb5508qa8XMXo= X-Google-Smtp-Source: ABdhPJyrDxvuEOzwxqg/NXSdG+3QLGoImx3NBPO/IKhsjWM+htee5QeS9FsgXY8Uc9BR/l6Oit/qUw== X-Received: by 2002:adf:f90c:: with SMTP id b12mr4410987wrr.379.1642779726324; Fri, 21 Jan 2022 07:42:06 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 6/7] tests: Manually remove libxml2 on MSYS2 runners Date: Fri, 21 Jan 2022 16:41:33 +0100 Message-Id: <20220121154134.315047-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779729212100001 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 Tue May 7 05:49:52 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) client-ip=209.85.221.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.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=1642779732; cv=none; d=zohomail.com; s=zohoarc; b=d3S2H1aLywCJa22/eNEzGKoSTgTHcBrmgbkhG3l9oqgtwXPFLtkd7wrp4efmwuNnPzvbkEuUmHJvy9KT2VXALlCBuiVrvzxHGOS+KexX0gt+RCJ95rReVR8Iu3hywDf1vfqkhKjjXZ72xC6l3kpKOg9kK9Io2lBPN6ZHgBR/HWM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642779732; 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=Gy5En6Qj7x/KcealazEvfy0jNsS2DrfBPdDbKTbHP/LW+edH8aq+5jy6SPAMNRW0U5FgpgXlzyBM7RkyEVunvQi4zVzobrM0I63RNPVBnAwkcWArRERwTV4Oxd0DWdlQrLT05Hp3njQJtNaiGK6CUajpW3XKzzszKbg7e2+FPg8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) by mx.zohomail.com with SMTPS id 1642779732717237.96180780537816; Fri, 21 Jan 2022 07:42:12 -0800 (PST) Received: by mail-wr1-f45.google.com with SMTP id k18so394742wrg.11 for ; Fri, 21 Jan 2022 07:42:12 -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 k35sm11583440wms.23.2022.01.21.07.42.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 07:42:10 -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=Q8WOhkwpW6oMWe3COIvMSUH3g2ho6zbTZEGH0sxHWgqu0aGYzweXzPU8P5zRAN37Mc U4Q1ZC4k9V+c8TOhzdvFutW57oj9ejzngwRQ4C5MT5a0PYqSlPbo89jfmZ7JMDUX+GB5 7kfTMiC1l3Ht5NNLuNNILnVIZcTn1Fn31RgwkBEJZVmAYmK6tzq+FUbFy48c3Pg45Rsg qIf1u/+a2uWc5ZXpRytytSu76wIj8VeE8Wq4Hbe/ES9tD6z51GxUplPfXYLMb7jxJ2EZ fXngHBSZzfog/LHs/LETOyUgM0hrzMKAcIY4N6k/QeizLmQqcz/xBFcM7bR7csKvGpUg 7gZw== 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=Sljm97rmrcKc76ORNcd8bmg8TcSJGCZPyXqxsM6EQQFSv4ovAKEScWnMca8rp05J8z yZpapnvCNdoEl1EQ02O4tlVClCjSXelQw/SdQKevQ707kEzPPGM7fr694ButLEynBH2b YBF4/LxIMeWQZ00DWGD6fGAwAfj6TIFoPUhS1MN12m0De9S1KvIlB/HPVTMyeBHLwwUb VLgojo0RYRbxfs9d1Xj1fWRLScVztSCjOx24S6qKWDf0w03XLfmL0JFwOeICenKh9kuf Bc282Xoa7FKebYWv+SZeqNBeWfvkTAPco5/t/vjOeOts765OzXIVEq+uc/MewtG7OYz8 UXJA== X-Gm-Message-State: AOAM533uRywlfdgKf8ZDuxD8GvJgavx6b4l4kwWxSpnj5lVhM+1VB0ai Jrbqcr+g7SK/ndxoxnBU5jc= X-Google-Smtp-Source: ABdhPJw5CHlSIsbi52WALW09ioFHFoXVhUCkjQb6+6gBzK+Lor/ikHwQIr6/PSpOdqaMLRBs3PPF8A== X-Received: by 2002:a5d:5046:: with SMTP id h6mr4373661wrt.167.1642779731020; Fri, 21 Jan 2022 07:42:11 -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: Ed Maste , Thomas Huth , Michael Tokarev , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , Li-Wen Hsu , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v6 7/7] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Fri, 21 Jan 2022 16:41:34 +0100 Message-Id: <20220121154134.315047-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121154134.315047-1-f4bug@amsat.org> References: <20220121154134.315047-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: 1642779734552100001 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