From nobody Mon May 6 03:07:40 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=1642761391; cv=none; d=zohomail.com; s=zohoarc; b=Fv6g7V0rydKQtuZHhzr9tbaoFCc4iA/REZhjBVd8kJfE9n0nNjrJYekBHX5QCVaKoknqKArlgK/kcqqS7Zjs+oNZnXmA3LkOI06Vr0w41/ljij6CLqXsKdDZgV1yQH2qhe4LU0HYcmRsNFurFzgh6n3zukz+uV6w2RaknZg9tq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761391; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=/jvIaCBMZG3MFfze4trUfKoA9w+9NS5OJInEkgsrJaE=; b=FZB3EYdwoCLsUlsVOaIg6yQ7W2CRmbO11gLZ1yOmR6zVEnWLwbnviA1Xdij1nEwSvmTaXaAk2QT+Uh9Opsvl2eggvNjmnmbGbRKnmBe4DDh8UNAVMaJk7d/LOmaupzEP/7tQ+jCdt0pNdejH3nryjMqr/5vlegI2rXUEoz3zj+Q= 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 1642761391772486.1971040619467; Fri, 21 Jan 2022 02:36:31 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so21310212wms.3 for ; Fri, 21 Jan 2022 02:36: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 l9sm5603707wrs.106.2022.01.21.02.36.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=/jvIaCBMZG3MFfze4trUfKoA9w+9NS5OJInEkgsrJaE=; b=a2igcTj/cVTX9I7DCJubNgBqcLsCTtKZ2NhrFRyutBcT0lWiRBnqbhLjHDP9seOCUK mm+NEoKsMkw27pjN6CqHmXTgT/GtfH28UVoJEryyZqEWHhT5PrPl7TbKc0IW2sLMJHBA ldyPD7xPbXwheolm5CECQXDTMs4ISW6pkLnmH8qpwpYpvNs0SH9y/RJhibH+Lfm6zfHW /CYKorwTBC/LS0rGGJ/4T9doiDDCkeylzAoGMpP6XnuSU1riRM05sVaTTqFrQt4uO1E/ xZMUDo7YfN6tm61PoXHLi4Gp/RuCBllF4Ms54jb+M1zZHDg8h8BhrVrciWeB7aJTA5EY KXuw== 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=/jvIaCBMZG3MFfze4trUfKoA9w+9NS5OJInEkgsrJaE=; b=053WnodKPM4AcDy/m1bU5rOAKMyuDyXiKqlswXUIbaQNaYUqwR6uf/R+gP5Q72w37A KIPoZHGp01OaRXBUbMLBv/ifTRXwYKyw1JEZ0LYBFFUM+rBKSIELod67yLgMv6ozEZUQ ZYTJnx11GRuM8A8z+jkOLolG+0kSMj+1Q6q+ip7q1M5ClkPHKIzeA+jFMhXCJu4uBa8V 4Qz2pOVF176gn3DauRq9bpDT7vkdKQWkJBAFL4ZnTOz/23PxYq99x30ZP/36ZjPfVArH auLeAzuUhqj2da5aAXE36fUFfe62ABzaRiQvfaJFxjo4kyWvDAZad0BkcDmqAzjN+TOp XbYw== X-Gm-Message-State: AOAM531bMcSvcEdGlgWqmn4HpFJm5W54t6tdKdea/pvN3SS8iUNFsS34 d66dUqMq//etEg7QH7BOPvs= X-Google-Smtp-Source: ABdhPJy8q7HKSbaE9kmNQib/S8oo8ELhhF/Oxv6l/IQgL9PNxo/OiPaX/fh51oP0WBBUDx7m2EEC4w== X-Received: by 2002:a5d:5888:: with SMTP id n8mr3198518wrf.652.1642761390091; Fri, 21 Jan 2022 02:36:30 -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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 1/8] MAINTAINERS: Cover lcitool submodule with build test / automation Date: Fri, 21 Jan 2022 11:36:16 +0100 Message-Id: <20220121103623.288054-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761392730100001 lcitool is used by build test / automation, we want maintainers to get notified if the submodule is updated. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- 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 Mon May 6 03:07:40 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=1642761396; cv=none; d=zohomail.com; s=zohoarc; b=V7AzXoEB8yNKpQSRsdeN+O+j76rmG1IkydYUseiGfsgqc/6KX+h3tTcavvQsTiesqLxOrj7WDxellva2hM39OhZFyv6dG41dHMEbrqRXfVJ0uMhXf39Rh7IP3FxhR9JaiPuE/GNYlexiINaybrL19NKrkbC+ef6YeXlJLTuCZPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761396; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=d80KwHGlUU/dphzpKAg6cdeTZhh7cy9ZxguMqHrvJaA=; b=BZIYut314qUn41PkilADsE0HRHIsbues8USzKMNlGBr8Q3BYpuEKlwV0oLTx7q4jPu4yv8GX7D5+8Oovl7fTAULtDa0QP51PltE9ijHU43Pz+8bBOIuWywpLn3Wk2Eeg6seP3i9aT3TbpF2wwB5AlIE2KOoBRQmNVJS4ZNYD3N0= 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 1642761396730663.9614713369463; Fri, 21 Jan 2022 02:36:36 -0800 (PST) Received: by mail-wm1-f53.google.com with SMTP id q9-20020a7bce89000000b00349e697f2fbso28095643wmj.0 for ; Fri, 21 Jan 2022 02:36:36 -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 l24sm4450301wme.17.2022.01.21.02.36.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=d80KwHGlUU/dphzpKAg6cdeTZhh7cy9ZxguMqHrvJaA=; b=l6GL+sMcVbnnvfnnUcVuwCorEkUKv8FQBv82xzd4/dSgOlRli+J3JASGMa/ytR8ktm YW3GI2NkxYUWGo/ye0EerZE+BnOuVTOAm5mdiFH11x8Vvo8ufkpFq3vJL2Uzcm4qCY4i rcqOVNp1Bg+rzMx+wv+b3ZVhYUFXPA1Xa6Sagf93yzGF/eO0VNDPIT79waB09L2ogbxk X44E1yHGSlaLnjCS1IZyBSrE62bPRVHmHFLbyEr3YUrbVytcAj2oNQhr8itc6Ki/W7rT Anw1aVhmsWWkwvZitxgmmsNkC5lWJlqXzkmd5HNqPvg8nPeW78SX73YqlolJH6xhlteX F6hw== 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=d80KwHGlUU/dphzpKAg6cdeTZhh7cy9ZxguMqHrvJaA=; b=zDX8h99jCdsZ8/uwFEs3+OyC27fFcWIX3kXuNYjqYDrxdpwcjY4kyDWVKygkoCrgQA oZAVFiGyQjKmpcaX0lmNqgLdJ56/PIIPoQdNRUyS2HvwmpQGYanGObl3HFWvuOGY5pOX F4SnDTonVoxn86rlPsVgrRjS1mwPvYCYOVKVfY0GEEQiAxJP15rBUtvqwS0Ms5WMJdoS MxGIRmkOyNBfOZAwm7KzcRLY7vDYoORRe92RE6f+ZvhxXYg26VRd48eki9IGSPA4fGxs y3seTG8szPkn/ABdqq+E/dtUlVKjCYPbZ+GPNfQhbaef0tUCBAeIULhPexUIXx6vmHzZ 5Nig== X-Gm-Message-State: AOAM5330jeA0uUZkQjhPTr2jN9X953cOjbxFOO1a4+MZZVDHlmEeImuK DBBjR/AS0x9TqO9uIowIgZM= X-Google-Smtp-Source: ABdhPJzG3ziMN1591+ZVbt9IBzLxPVIx6c3Xte0eeZR3ijxuiDvlLJzgPv5kEzxs2QrOmn9Kde8Z9g== X-Received: by 2002:adf:f68e:: with SMTP id v14mr3439122wrp.585.1642761395052; Fri, 21 Jan 2022 02:36:35 -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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 2/8] gitmodules: Correct libvirt-ci URL Date: Fri, 21 Jan 2022 11:36:17 +0100 Message-Id: <20220121103623.288054-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761397755100001 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") Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Thomas Huth --- .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 Mon May 6 03:07:40 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=1642761401; cv=none; d=zohomail.com; s=zohoarc; b=ivuR9xd0Coaz0SZoo1asky1yEe7lEYH66hWjbJI2DxQEJbMNEQg1R+PZ4XcUnoNw7Y8Rgng/PZ0RSGzDN8fLvZHA8sadKdhTODvS8nNymyw5ZaF4axIKFbt4NmN4I9UUkorJu17jk/TmU6yndEl9B+mQl+FbCmJc/EFOknedfsY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761401; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=0KVY8Kf1y+JHjZqld1jSJ4nxhvF4HzqE4UdFx7oCrkk=; b=YajubkBpzqSu7VhdeaCmI4EiGOVsjPWXMcqC000uuBCfz+O2BEq+hkpJsWeIaklVPndIP71XdY5g5PtXRhmJ7R8ssJb+qGwUbQPAsCMgks0XzCzrffgUb299M/wIETMbeyuMGhgjeRwTVR/XbcsuCWpEhvHLepXCRBvj1tXKSH4= 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 1642761401697441.926126591138; Fri, 21 Jan 2022 02:36:41 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id q141-20020a1ca793000000b00347b48dfb53so21488779wme.0 for ; Fri, 21 Jan 2022 02:36:41 -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 i6sm4972088wma.22.2022.01.21.02.36.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=o12AYVZgcxipTSbkO0kiXH/iKlyhmo5viyilFO9pQqqRKMPx4BQsi1QFJgfTciYcIb eAWuhI1bpW49Pguxpu9Uxb++VOlPnCHoZ+PjCl8srhdEClEMKO59MT6B8E8MAnD3349D xYWDBp5oWDTzB9LHSIgE88/vCxzr6itkylKorzSsKH+zFdza8ot0IKaLlEuPWUsuWIkl IutsXJkfViHNSNs9OOTQmvrzcHqQjZ/o6fbbxc+UFCOAsoXpWmaqLWCc39+XDaAD+gvt Lh/meuG8vhGhI6UPwMID9/LrZpOnahLG6MG3mxTaHb5VMmdUziF+gYG57/qNNzOU6KH4 99qQ== 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=N0DqrjGciweaOuh5Ki/voN4MlF6XQEosAFqWUd5B3tK0aIvwqRBuNyaGpmYMmmU1uy c7/TqhRC59cRzDX9gdeaqeJUuenwABPjwg26wkbg1d+mG//Xsr5b8+mfMi4+8gBSJrpv TulEW5auWhCgTYkIkNXaQHUTyBUxzP3MuErQ4XUJY0EdWN+w8RRMF6w0q3tCw3gIoXDP OMmf9CBtb/bimp3x03vHKY+ZOkI6T4jRCEkEoN7bLUcyvaCQcNTz5Vr+VWb2BnRxzc36 hV7Nlv8d4hOvvjMeHLe95Bmhrb3a4o/jnzf5p4dTYQN2FrQgV+a9C5fnuzsBejhUmO5b S+fw== X-Gm-Message-State: AOAM530byADT9R57s/5TwWqMusoaCcL1a3Gb8S4CSkPWYe7iLQuLsKJ9 /24DezXdu0MaRwmhVG3UoXE= X-Google-Smtp-Source: ABdhPJy/FgMVEGGLUzf+NBzfL0ZTMU7ewwzzXUPizU7KMpPBdWsDKdrVXRp12Wi59noMzo1Nu8pg4g== X-Received: by 2002:a5d:47cb:: with SMTP id o11mr3291946wrc.698.1642761400003; Fri, 21 Jan 2022 02:36:40 -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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 3/8] tests/lcitool: Include local qemu.yml when refreshing cirrus-ci files Date: Fri, 21 Jan 2022 11:36:18 +0100 Message-Id: <20220121103623.288054-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761405084100001 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 Mon May 6 03:07:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642761406; cv=none; d=zohomail.com; s=zohoarc; b=IshsM8qEig4675J0kNWX8CHzWvJkLxVpiX7xlMy4NFMyji/AxMcQhRKrJQlXt7uwt7nH8C31ZKT1lnxQFoHwhNVjCLQOLa6t/xbLlo65WIOrzdpIMm3D8F3bx60Dkp50e46Mh0n791yTRpf5e7ZxczC6ixE3y/50+qlVodpGxjo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761406; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=oDbYCqQU1dkGaz37OaieH0ILazUkrWV4OQ7/olVfnlU=; b=bTEfNZIU9XSiXvD+N9dcCMBIXeg5w4dCJVKHhFk4OozhKCgHqXb/3LdoZEg0CMbdnQCCEiXGmovJyXkX0J53spColYy82hvpP0b+ifqJcxQS7BOneJCdV96v4OST6O39f+HUA+Jr6MVhAneBdrf3Uap+FtPrGAGcE/tSYrAcnWA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1642761406881781.802504882615; Fri, 21 Jan 2022 02:36:46 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id 125so1088379wmc.0 for ; Fri, 21 Jan 2022 02:36: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 p6sm6505247wrr.7.2022.01.21.02.36.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36:44 -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=oDbYCqQU1dkGaz37OaieH0ILazUkrWV4OQ7/olVfnlU=; b=jR+k1zFlfdaF3+9nYqJ6SNr4ASA7TYCEDle6m2MzCOgfL0mw6Kt8If5V5nHsGCu9Ee tyDB91QeCRUZSLQlRZOqgNRJ2xOQsMgnMOeo4CZ+cCioBPzYVIqG/KJeBrmyIQKGLE6m kkxIEz+gDI1nUf/ursV3geZvXwlsNxi+mcJJ9K9+fC4H4yyfxMm7Ed8bOyRrG7Hvt9Qs DYJLCrEaZ5Md53i+Bh6uOet62fihXz0iiR6kowHeaBXLHI0dP6h5NRqn9cIrec6yoLJ4 wq/A8RqsS9WzCs5NGHLb8fwKU31JvRG+LeFHnoDFB4QI+/wEf0mZgDi/7IlLuXB5OKql AZsw== 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=oDbYCqQU1dkGaz37OaieH0ILazUkrWV4OQ7/olVfnlU=; b=s8RYuzGev3Yk7vPFFY+O7Wu1RLY36/nL9IRncsqVR+ml2StCj+GoCRN7Q4yW6UpTSf cdwGFqyE9TBnNMs8JkuNBG3VAnEgxsYOCYkSElO3monpq/JxMQUWwP2Cb7rsZeeAJ5tE 0jzWsJtgFwB4CP6yYakHhI8V6gzHCpzJZ6MmKK1ubyF1gWu7wVyJsmY8C1+rND8iwlmX Smm6zApCmv8ob6vyU5YPriwEtlU2JKfnQgysBWD2tJFiSChWPDhFV5rqAjeKPoezlRFT 3RwFAU/1V9D1RVgl5j0m0kS0/cDGHlK/UHXAAFe2NADzPDwRAlSKKCCfqlxlzPZAzBz7 r0tw== X-Gm-Message-State: AOAM531E+YgwfqdVQ0My68o22sjxaddH55faSr1/dV243kyFiBAaFgiH ukbh0YF521Xeqxn5xnONSLU= X-Google-Smtp-Source: ABdhPJy/uIXTpm/89nLP5W2JWQpvf9xh1F9og9iBKEVr5DT+99Z2Hz+r1imHnKwX0gsd9wgK49xalA== X-Received: by 2002:a05:6000:10c1:: with SMTP id b1mr3382114wrx.226.1642761405096; Fri, 21 Jan 2022 02:36: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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 4/8] tests: Refresh lcitool submodule Date: Fri, 21 Jan 2022 11:36:19 +0100 Message-Id: <20220121103623.288054-5-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761408498100001 Refresh lcitool submodule and the generated files by running: $ make lcitool-refresh Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- .gitlab-ci.d/cirrus/freebsd-12.vars | 2 +- .gitlab-ci.d/cirrus/freebsd-13.vars | 2 +- tests/docker/dockerfiles/alpine.docker | 3 ++- tests/docker/dockerfiles/centos8.docker | 3 +-- tests/docker/dockerfiles/fedora.docker | 3 +-- tests/docker/dockerfiles/opensuse-leap.docker | 2 +- tests/docker/dockerfiles/ubuntu1804.docker | 2 +- tests/docker/dockerfiles/ubuntu2004.docker | 2 +- tests/lcitool/libvirt-ci | 2 +- 9 files changed, 10 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index 9c52266811f..bdcce578edf 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 libxml2 llvm lttng-ust lzo2 meson ncurses nettle n= inja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow= py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml pytho= n3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredi= r virglrenderer 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..ee610c89fe1 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 libxml2 llvm lttng-ust lzo2 meson ncurses nettle n= inja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow= py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml pytho= n3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredi= r virglrenderer vte3 zstd' PYPI_PKGS=3D'' PYTHON=3D'/usr/local/bin/python3' diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfi= les/alpine.docker index eb2251c81c8..9d7f74fc51e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile alpine-edge qemu +# $ lcitool dockerfile --layers all alpine-edge qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -109,6 +109,7 @@ RUN apk update && \ zlib-dev \ zlib-static \ zstd-dev && \ + apk list | sort > /packages.txt && \ mkdir -p /usr/libexec/ccache-wrappers && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/c++ && \ ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index cbb909d02b3..fde6a036263 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile centos-8 qemu +# $ lcitool dockerfile --layers all centos-8 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -69,7 +69,6 @@ RUN dnf update -y && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 60207f3da38..82f504e40d6 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile fedora-35 qemu +# $ lcitool dockerfile --layers all fedora-35 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 @@ -77,7 +77,6 @@ exec "$@"' > /usr/bin/nosync && \ libssh-devel \ libtasn1-devel \ libubsan \ - libudev-devel \ liburing-devel \ libusbx-devel \ libxml2-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index f57d8cfb299..30e7038148a 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile opensuse-leap-152 qemu +# $ lcitool dockerfile --layers all opensuse-leap-152 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 0ffa3c4d4b5..4ea272d143b 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-1804 qemu +# $ lcitool dockerfile --layers all ubuntu-1804 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 4e562dfdcd3..90988b2bc53 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -1,6 +1,6 @@ # THIS FILE WAS AUTO-GENERATED # -# $ lcitool dockerfile ubuntu-2004 qemu +# $ lcitool dockerfile --layers all ubuntu-2004 qemu # # https://gitlab.com/libvirt/libvirt-ci =20 diff --git a/tests/lcitool/libvirt-ci b/tests/lcitool/libvirt-ci index 29cec2153b9..226c178a2a1 160000 --- a/tests/lcitool/libvirt-ci +++ b/tests/lcitool/libvirt-ci @@ -1 +1 @@ -Subproject commit 29cec2153b9a4dbb2e66f1cbc9866a4eff519cfd +Subproject commit 226c178a2a1f077d7ee371680cc649c1591b0457 --=20 2.34.1 From nobody Mon May 6 03:07:40 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=1642761411; cv=none; d=zohomail.com; s=zohoarc; b=UHoIMmXO0IsQs/GlsMuOKlTifmtMNpQhVC27Z9u/fGvpHnq6eqsBS6vtl3QpKSbMpEiM1nQfTUEl+fNFHvUrvyHqnXzzGzC4Uv0M4wOgK7Sqwmqw2Ja0J5QMV5H0lZpYcKnTGLIIw47ZxJ9uAO0GHsLQG8aWP4luRd7MBM6KeNo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761411; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4Tjd8wVbUrFFk0Vv7+6+0PlH5zCkrfjOZaloy1pivCI=; b=T0AdFHgtgMqZtCJmsHT7ReJW3NLFVEhWnnEgm0f+ctj0HtYTZD0BKre6npvDTE4ZyQ16e1zpch6ynOYIFW0/0dSCyLgX2Y9cM321jd19CMhzH+LdmO83XeJcZM54wzrcNeS5y85NdUExtLJYOutFQE34KoaxdMsNJqPkEA+yzjA= 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 1642761411815764.9609430471188; Fri, 21 Jan 2022 02:36:51 -0800 (PST) Received: by mail-wm1-f46.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso28044835wmj.2 for ; Fri, 21 Jan 2022 02:36: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 m187sm4581501wme.25.2022.01.21.02.36.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=4Tjd8wVbUrFFk0Vv7+6+0PlH5zCkrfjOZaloy1pivCI=; b=mP8Z1L4xDevRjk4Kr4aFjvQqtG2E70lhT5oYBlcJzUlRsSdKPXcctpS0CAITaA37XC 5ZQzhZZZdUetdSVMMUIbY3HqIIEEvvmcBBvHGb2rTlcfQhamKYCOPysUSLpwtwy2ELaK daWREy/jWGPW6gJ08luzX3jpWfzoaue/dutOw1/RWuHgrLksIBoAqR8rGKxhtlIzRC8n ngQ85Tnmk84orGNVMN8OgvwYCUKT9AtN/yD0eGqOjQVuNRdBDq20cqEtrTgkhr2zma6e 9Am2/oi4JtFe+6l2B/wCGNXAky5RSKPSQ5FArhro30SeKOmJv1A443uQUnurxtdvYjv1 tK8A== 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=4Tjd8wVbUrFFk0Vv7+6+0PlH5zCkrfjOZaloy1pivCI=; b=FmbCZTSj3FRQFgfGDN7N3imy/qdv3it3gNSomQ0YfV17fGi7mD80BYVkV6jxrRbN8E 94ZpmjYumwvGJmJucpio3hZvtW6cVq9zn9OuYEIwL84BmdySOcNLyks9HFO6tt0zYxS6 Kf4GgE8I5Tn+Q7+XF6PK/hHanN7b3Gk4Psz0cA6I4W3qhrsOdnZ3JKHEQC/Cyk586yUq 0GfdmqKYDoZSpc8Gg8L6WSlqojrrGv77lBz8EwcILCkx5/jXvHqthKNtp8f1ubRi5Q6t UdZrX4hkVuvv8cSsTjZXDzSfLuiRXCfa9slQ9WVlWIttXTMxBzkROa/YppJL2iOYNYne yTtQ== X-Gm-Message-State: AOAM532QqENUFe+RzGMnmAdz1FHCY2Q+6qL+X/iPp3Z5nrWUFKmLdzkw 8IU6Y1PMnlJL7Hvtf4b6crw= X-Google-Smtp-Source: ABdhPJyd5V/ktkKDDwzWvqXkjmzvJJc5jMlbpXcsZPwi7imH/sItfoe/OYe7KRThJv8HnrRvaJHwGw== X-Received: by 2002:adf:f9c5:: with SMTP id w5mr3386692wrr.362.1642761410063; Fri, 21 Jan 2022 02:36: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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 5/8] tests/lcitool: Install libibumad to cover RDMA on Debian based distros Date: Fri, 21 Jan 2022 11:36:20 +0100 Message-Id: <20220121103623.288054-6-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761413106100001 On Debian we also need libibumad to enable RDMA: $ ../configure --enable-rdma ERROR: OpenFabrics librdmacm/libibverbs/libibumad not present. Your options: (1) Fast: Install infiniband packages (devel) from your distro. (2) Cleanest: Install libraries from www.openfabrics.org (3) Also: Install softiwarp if you don't have RDMA hardware Note, librdmacm and libibverbs are already listed in lcitool's qemu.yml. 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 4ea272d143b..7ebaab82b97 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -52,6 +52,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglib2.0-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index 90988b2bc53..b93707b70d4 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -53,6 +53,7 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libglusterfs-dev \ libgnutls28-dev \ libgtk-3-dev \ + libibumad-dev \ libibverbs-dev \ libiscsi-dev \ libjemalloc-dev \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index ed5ab1407a9..948b9912579 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -43,6 +43,7 @@ packages: - libfdt - libffi - libgcrypt + - libibumad - libibverbs - libiscsi - libjemalloc --=20 2.34.1 From nobody Mon May 6 03:07:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) client-ip=209.85.128.45; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f45.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642761416; cv=none; d=zohomail.com; s=zohoarc; b=I1/O8Pn5H3c+lqeWu+mEheK92UHxMPA8+YSzzUDvJCg2VMONon+qKGxMlrxmgdZNMFS21zRr47XzbilAzRAhLBFxtGhGSHZwSn+tuAPkbdPtFek4ndLfVv95aVsIrgCzleHI56WBtpTOX2EUglZ1XkGoUj4aBQgnWkzBH7qSCKM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761416; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ZZgerq/Ox+dDJxsITCbhd0a4LAgF31nJn3RW/JNrLhM=; b=h9+IjqmpsaRobBS/qrc17c8rAbZzHuUF3Stw0IvDDKVyY/cSP/rPWriCW1BSvYg095h2RnmfgebEbr1SbAx8uuo/prw65ZWlZxQCApsn8tJQ3ZDUck0bcy5W3l+zIDj9L2IktJjz3aeWCatB+VsCEiU+H0y+o3g9Nt2Ong/9RrM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.45 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.zohomail.com with SMTPS id 1642761416953213.96558930788217; Fri, 21 Jan 2022 02:36:56 -0800 (PST) Received: by mail-wm1-f45.google.com with SMTP id i187-20020a1c3bc4000000b0034d2ed1be2aso26603782wma.1 for ; Fri, 21 Jan 2022 02:36: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 i15sm6791527wry.100.2022.01.21.02.36.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=ZZgerq/Ox+dDJxsITCbhd0a4LAgF31nJn3RW/JNrLhM=; b=dL0T5BMTnGgYALL5h/78af2NflrVFBanwHAhYDmYcy9MOihU97fj0gaFTt4ChBitcZ kNDAudY7dkJhzwz2BmcbI5+H9PX4ZHi2ZXgnvbpzCN19ne2kWynb4Gp8JvUKaD0DjOUI GiXja3b6ZxYb1XQqJVHgBZzEfnECR3P2i51O/nXPGd9r9W5LeK6erFkoWAatVIfzZXwU 7cfFrINV+bgGaU9YcqBeIkdoPH2WMSLmzqXr1JPwewjGAtdYUZQdddtxUiXPOuAzRRR3 xW72GFX7UzxitFNKkEImQQ31cdW/zJh3pSpWCUKdTAR8WEOo91imK23iTzOAjsfnlJRm doPQ== 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=ZZgerq/Ox+dDJxsITCbhd0a4LAgF31nJn3RW/JNrLhM=; b=T8WnjUXgeCznXUxDQ1foB14phWbwUjfDEzcS9ljgE6ahwNuqd8UCfWPTj20T8PbB8i EZ9gVYmGk/evzSNWB/WKIDl5UGSdPJWV5ANMNjPq2Uetab0GJlmRQ5o2bxgL1eGhd94S wiMjK8+qrWJCrmqb2xlmH63LzUiR0YhQuicjKRc80lPlylT/IAELLavSkIBUb+i5ncyw wgrfmLaQnVtplzCCFJiFX12B7815c/w7EZ+lXjsSKuImd6KC6XFVcxJuMMI/X0i5RR9X k9Y/DvffbYzXKQVAxpzO+9oyH6An8qTg0RPfZ8r9TOaqWwBQlguLzYYhGXpYPTI8a5FQ GnpQ== X-Gm-Message-State: AOAM531FWkXfA+pP2kxk6hx0mJ9rM7fmS5H2NaTnxY4fXxYIwxOluRcS Pi/CD5REJgIM9UJx9+kcFIk= X-Google-Smtp-Source: ABdhPJz7zUB8OGJmAbQmZuy35rS4x1GfPfcGXdDFH3BL1JDM02Jsr4sz4HSdciYec5l1mAQrZW7kYA== X-Received: by 2002:a05:600c:6013:: with SMTP id az19mr130542wmb.53.1642761415145; Fri, 21 Jan 2022 02:36: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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell , Stefan Hajnoczi Subject: [PATCH v4 6/8] drop libxml2 checks since libxml is not actually used (for parallels) Date: Fri, 21 Jan 2022 11:36:21 +0100 Message-Id: <20220121103623.288054-7-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761420885100001 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] Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- 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 +- 7 files changed, 2 insertions(+), 14 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..." --=20 2.34.1 From nobody Mon May 6 03:07:40 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=1642761421; cv=none; d=zohomail.com; s=zohoarc; b=C5pEJMUT39Xcfz1Y4VA06beCIcJ+J4zJu+2+6NGOD5UH3SEfZtokQ8Sz6jNg3vtgn9HKyxrj/HLj2+pziabc1YHwlXLlfkEk34GwVvm3gIn9UPLPoCZuF9Pv4d9ta5GcYwR6zf7GY8CZ1oTsS0bxO12c1G/ngawRN/MPtap1xTY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761421; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=D/pCUnOSaq7tTFgp9CbMN9iN4eTV+D4k6/1w1OAPFdc=; b=ltQnZZH+QksAMkZ8+hUkuVtzpln8VKxCNQITBGJ4YdJUxgSwtBjvfoRxjnDEs/Ozof1nM18qao4zEUYVkSzqfKzG1Q7RaQdCHxnhq1i0l8tBh7lNh12eXWDocNgZJoWLEfxoMP5Xz1PcQ+v2HXr/aUD9/Vb9iD1Wl4SI/DJ/EkM= 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 1642761421905312.2658302483028; Fri, 21 Jan 2022 02:37:01 -0800 (PST) Received: by mail-wm1-f41.google.com with SMTP id l12-20020a7bc34c000000b003467c58cbdfso28045682wmj.2 for ; Fri, 21 Jan 2022 02:37: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 u7sm7485400wml.7.2022.01.21.02.36.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:36: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=D/pCUnOSaq7tTFgp9CbMN9iN4eTV+D4k6/1w1OAPFdc=; b=hk5FpOHrDJ6PoMxMg7NvyCoVZC0SjyOp0262GbLWOSIYWIoG2+/F/QEBN7/z1ewu3C BXQdNzbcg3dY4aS07NXKc13x8YXOiNEgUswqAnw52h/eEBjiSV2+5R3mpx8cK4cdNckF yF1Bp71O/XsgelgchJ3dsrdTznnzBYOwb1rdDSNYTdisWihQ0NdQ2BQ7rMwIKz6vohfy oUNnLcU7GN/lfMc2HQ3vQ+QbPpW2ePmoj8roCrQt0ALAmQG059kiCcbC1TiEsUVm6lPu /pw0vKOgqEg3N9aCElNqx5tmSfpgz4RfHyunleTptPO+eFzykwhtp9/ezySBI9kbdP43 L4oQ== 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=D/pCUnOSaq7tTFgp9CbMN9iN4eTV+D4k6/1w1OAPFdc=; b=hlSi/79AgNo7uZfjw6mPVlyzrxat3GdK6oxPJuJZ31usc60zT3vXswxhpSot+Afqdu xWcDjV3F1bF9+/x9ARjYS/GnJUpnLVtXZAIhDXMUquyIGInxrxT7zhB/fwSi8NDAnxak 94HvbhDiS+7lgEiSY4CqHYrHos+yIXBa4HsEFWeKZlpXyRIyHvapv9GcVHO8AufkzZSb QEnWrGYMBjRbxXTsP7GzGV5f4hA8B/LsRpM0yo3VVY2JFlvSsvKm1v1zMifLfX2e4BGV EJF0QtroT7KqqEO6boZEXeKcjd24hiZPARCLoYUgevxP5mWb5PkcFg475ZucnAc0/4li 55NA== X-Gm-Message-State: AOAM530ZsRUUPr9dKQEcxT3OKnE0ZzzZYymOkGomUKEfJEk2jyK8wyIL qEO9uuVOozHnTHotAZvIDDQ= X-Google-Smtp-Source: ABdhPJzX4zozHrurgzuN9ewBNArt9llBwz4MroezWhc46gTT73xk7onB/dZvg8p+DB/aiFov15gKlQ== X-Received: by 2002:a1c:c917:: with SMTP id f23mr183834wmb.10.1642761420163; Fri, 21 Jan 2022 02:37: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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 7/8] tests/lcitool: Remove libxml2 Date: Fri, 21 Jan 2022 11:36:22 +0100 Message-Id: <20220121103623.288054-8-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761422555100003 The previous commit removed all uses of libxml2. Update lcitool's qemu.yml 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 --- .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 | 1 - tests/docker/dockerfiles/centos8.docker | 1 - tests/docker/dockerfiles/fedora.docker | 1 - tests/docker/dockerfiles/opensuse-leap.docker | 1 - tests/docker/dockerfiles/ubuntu1804.docker | 1 - tests/docker/dockerfiles/ubuntu2004.docker | 1 - tests/lcitool/projects/qemu.yml | 1 - 10 files changed, 3 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.d/cirrus/freebsd-12.vars b/.gitlab-ci.d/cirrus/free= bsd-12.vars index bdcce578edf..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 fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle n= inja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow= py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml pytho= n3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredi= r virglrenderer 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 ee610c89fe1..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 fusefs-libs3 gettext git glib gm= ake gnutls gsed gtk3 libepoxy libffi libgcrypt libjpeg-turbo libnfs libspic= e-server libssh libtasn1 libxml2 llvm lttng-ust lzo2 meson ncurses nettle n= inja opencv p5-Test-Harness perl5 pixman pkgconf png py38-numpy py38-pillow= py38-pip py38-sphinx py38-sphinx_rtd_theme py38-virtualenv py38-yaml pytho= n3 rpm2cpio sdl2 sdl2_image snappy spice-protocol tesseract texinfo usbredi= r virglrenderer 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 9d7f74fc51e..591af43d60e 100644 --- a/tests/docker/dockerfiles/alpine.docker +++ b/tests/docker/dockerfiles/alpine.docker @@ -56,7 +56,6 @@ RUN apk update && \ libtasn1-dev \ liburing-dev \ libusb-dev \ - libxml2-dev \ linux-pam-dev \ llvm11 \ lttng-ust-dev \ diff --git a/tests/docker/dockerfiles/centos8.docker b/tests/docker/dockerf= iles/centos8.docker index fde6a036263..3abac7a8b13 100644 --- a/tests/docker/dockerfiles/centos8.docker +++ b/tests/docker/dockerfiles/centos8.docker @@ -71,7 +71,6 @@ RUN dnf update -y && \ libubsan \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfi= les/fedora.docker index 82f504e40d6..1d01cd94405 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -79,7 +79,6 @@ exec "$@"' > /usr/bin/nosync && \ libubsan \ liburing-devel \ libusbx-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/opensuse-leap.docker b/tests/docker/d= ockerfiles/opensuse-leap.docker index 30e7038148a..1b78d8369a7 100644 --- a/tests/docker/dockerfiles/opensuse-leap.docker +++ b/tests/docker/dockerfiles/opensuse-leap.docker @@ -71,7 +71,6 @@ RUN zypper update -y && \ libudev-devel \ liburing-devel \ libusb-1_0-devel \ - libxml2-devel \ libzstd-devel \ llvm \ lttng-ust-devel \ diff --git a/tests/docker/dockerfiles/ubuntu1804.docker b/tests/docker/dock= erfiles/ubuntu1804.docker index 7ebaab82b97..699f2dfc6a9 100644 --- a/tests/docker/dockerfiles/ubuntu1804.docker +++ b/tests/docker/dockerfiles/ubuntu1804.docker @@ -90,7 +90,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/docker/dockerfiles/ubuntu2004.docker b/tests/docker/dock= erfiles/ubuntu2004.docker index b93707b70d4..87513125b8e 100644 --- a/tests/docker/dockerfiles/ubuntu2004.docker +++ b/tests/docker/dockerfiles/ubuntu2004.docker @@ -92,7 +92,6 @@ RUN export DEBIAN_FRONTEND=3Dnoninteractive && \ libvirglrenderer-dev \ libvte-2.91-dev \ libxen-dev \ - libxml2-dev \ libzstd-dev \ llvm \ locales \ diff --git a/tests/lcitool/projects/qemu.yml b/tests/lcitool/projects/qemu.= yml index 948b9912579..958868a6ee9 100644 --- a/tests/lcitool/projects/qemu.yml +++ b/tests/lcitool/projects/qemu.yml @@ -64,7 +64,6 @@ packages: - liburing - libusbx - libvdeplug - - libxml2 - libzstd - llvm - lttng-ust --=20 2.34.1 From nobody Mon May 6 03:07:40 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) client-ip=209.85.128.49; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f49.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642761427; cv=none; d=zohomail.com; s=zohoarc; b=fxMnyXQrbjc41opzpUip7vO236IE/OpeOxbf7KC3+EzIftyVZVGatQA9TuRvjm49uZyiHu40V59xbADYLubbOkKjqvhdEcjIniLdAUmc6rKWLEEBIkOnV7fL30HYZdKY4lbG9Tx96Zq/Yc+lo/oU/cIV2r25zG8m605Q+82871E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642761427; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=vabZUgXCc8y6pgkTLFnvHt9OHIbqfyKMtptKUA3UOiA=; b=nwoPB1h12EF/bC8p7s3s+UbtSVZh0Yo09SkNGATVa8m95vZbCHipf5ubIFA0118T0oSiVQ1haKMQiKAXlQ+k/AfItZ8MVfVuTJENpbI8WkH2tbyhYaxv9ETTKCDi+u5seTdJTKGB89kDkIsY3jup0Xiq8TWaOh1NTm4PFMORMWI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.49 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.zohomail.com with SMTPS id 1642761427180983.651246358063; Fri, 21 Jan 2022 02:37:07 -0800 (PST) Received: by mail-wm1-f49.google.com with SMTP id j5-20020a05600c1c0500b0034d2e956aadso21301048wms.4 for ; Fri, 21 Jan 2022 02:37:06 -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 m187sm4582099wme.25.2022.01.21.02.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jan 2022 02:37: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=vabZUgXCc8y6pgkTLFnvHt9OHIbqfyKMtptKUA3UOiA=; b=MdQZTTxoLV7ou3v4qkIl8VaNlQ0dIRdaLZ7ECfPKXhwLYj85bPjy8r5cs14paSY1+2 NyO8br1PpPLYZx8R7usuOrx8K7xqR27Urd1WTOQkMuAGRB63kZ53DTrESNT/RVQmOlcX Oj8YGCJFFV4h21AzU1TXmOBhNEMIrrJuqOzcfYDUYxP5QBoPNMy6AxkEtBVXiydiKg2k Xf/5wmdSJt+6jE3r8LFRQaFAWsVsY5aPlIndufURxKhng8AdTjSWW5RHD06jCAVh+pra 8wPB1IGv6b9CAkHxbId5JL/2dRkZeMOQkSLJBlJQaDFo0I3c80OupEJ98RYQTnVEqTG0 6sqA== 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=vabZUgXCc8y6pgkTLFnvHt9OHIbqfyKMtptKUA3UOiA=; b=C4WSRasFgBKR39pdAKh96vEX73XMdCER2fymgnSzlcDH5/MIotH3DDTXoobotQM+Su rdyBrucvleDvNtZNkmZEdf5O4Q2QAlqeveRUmXWA/Ear11eJVGrEO+sToCAS4kccHvTn 8EQO712N/7Kq+O/IbTTSnXNHewTuNeNho61IFKBMaqvVTj/0rFzbfkWtGbMIjdtz1mWE Sy8dsdW17uqFwrB++aASuLmnGPiVJsWlgj3CJhOffWGdz+Qnx4a+yoFQ6nFBGFMRLs4v vQnN07mDPnt809Lj9eMAKrnUbXdR1fZ74Aw/VRm1XhQlSiqHJME8tkIUgVanrR5nub+f Zwtw== X-Gm-Message-State: AOAM531Zohmz1B2NL4ydjvlIxfl7Xlv0dXQ158FOwiG9pB4TkgOpTmgR iR/fhJvzYtuzdeKof8HJIw0= X-Google-Smtp-Source: ABdhPJxY6L4haEf9le5FdR9Wq6MY9nAYmSibtm9/kRlHsGCgDskzcaH+tXrv1ThakLfo+bQ4mxqZPA== X-Received: by 2002:a05:6000:156b:: with SMTP id 11mr3235668wrz.283.1642761425434; Fri, 21 Jan 2022 02:37:05 -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 , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Thomas Huth , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Yonggang Luo , Peter Maydell Subject: [PATCH v4 8/8] tests: Manually remove libxml2 on MSYS2 runners Date: Fri, 21 Jan 2022 11:36:23 +0100 Message-Id: <20220121103623.288054-9-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220121103623.288054-1-f4bug@amsat.org> References: <20220121103623.288054-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: 1642761429095100001 lcitool doesn't support MSYS2 targets, so manually remove this now unnecessary library. Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- .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