From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:23:16 2021 Received: (at submit) by debbugs.gnu.org; 20 Mar 2021 21:23:16 +0000 Received: from localhost ([127.0.0.1]:53211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNj40-0004dX-Cw for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:23:16 -0400 Received: from lists.gnu.org ([209.51.188.17]:34654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNj3w-0004dO-PB for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:23:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNj3w-0005H9-GY for guix-patches@gnu.org; Sat, 20 Mar 2021 17:23:12 -0400 Received: from mout.gmx.net ([212.227.17.21]:43759) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNj3s-0007KT-1l for guix-patches@gnu.org; Sat, 20 Mar 2021 17:23:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275384; bh=FZF67gV0ZunrIUHddIDYBGXP94zPCn5s4RCvT56w2MY=; h=X-UI-Sender-Class:From:To:Subject:Date; b=A72mxD4P4KfJyOUfq+hl9B2QnTZZc/OTOMv7lORe/OcusrVI9gsQZbho67Gsbcavl ZP+7mlo8jqmjPN3JJiKEVN6iBIdmIrb7sP+NbKATOT0clsrC7BJC8KfiW3S0QTCpjB cj3NeID8GeYg2GniBLnsleezE94YFjY/gJ+aWKZY= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MMofc-1l4xDw1Bo4-00In8f for ; Sat, 20 Mar 2021 22:23:04 +0100 User-agent: mu4e 1.4.15; emacs 27.1 From: Pierre Langlois To: Guix-patches Subject: [PATCH 0/4] Update libvirt and friends. Date: Sat, 20 Mar 2021 21:23:00 +0000 Message-ID: <87o8fdwmdn.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:9ZdDB5OEjc+m56bVFG3p+Ly1r9w4PZYPQtwy1aeHfCJZYq5CAcE qCV71ZrkZvFNhBdLdBrZfl24IIFpJrntm6Mh5LOBXRwxTZmF25dqAhH9Vl8OpJfDHC5lszZ UFezPP9WMncckv4SVJ6cB/oub9z3mjiEDDjMAYFNPYejylNXOiphUb17Zy/+0/4KjXfbRm5 VttnP55r4WJ6wAWuciitg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:NmU6fGuz2c8=:pvXOaGldNiwKA2VJUMri6i CiKT9KG0x2rzwFsMTBiawkKkbfz7J/AdLPZ6FRbmF5O2KAwDTIj0Q6zhp32wOn7Ryg7oVALDk WwQTqonKOM68PiSsnJYyNdhYmb+I9VVtb9OIRGzOANBIj5e/bhu+vFm7pGMjCgpQJdcO1fQ/k J28MYKl+p+K5a+J01SCwotjWuCeKOA+IlncORwPC4im4dAXjaZges2s/lhIb3LC8tLM++kq8u mgVqJte8kCbx5Oi1bcOkw1tYJAfIpGar7ppqxU51fNpn+4ADxaS/5k8m3f3XjZbjEwKaFwn6a Yel9LGA9JyRT49eC1NMw0a82KJFYKMKQc5mEDjaIX79vN72udnE/WMQI3TznmNUCIqLwsJ433 Ot5RC1eZO/GKB7m7Qy377YymVjjRuq2TtOCM+QEbzCBhZzKXuxNbxjctvHWK62duVEGNGuyDT oCit1vkZusOpFZrtzBSdK0UJ3jazc3d6gn69MkxgapOKRW8DCIqCY0eiHylUr2Axh/gWOqtQg Cqm6fufCLV6yvvO7OHeuzOGxEAQfsr4p1VSI1Ft49DH0cuz93ltvQHTt1poZGJkLRtRaGSqpQ h0xvNcPzGzeY3bIEXMCiPBM5tjkjXcAkp3KkYL/TLkEjq20FcXAn5LQJyYrF3OUk/RLVgsGf2 1pdIgjkR7vPsCUJ/gsH5NS1FNJlsqqPYgdmhOAlyEPIEF6VXmn+bbB6K7lEAwD7YPx+jkViSC fSjSG6qLeQSrJsEbxOWLECQQSwztIbJXnzqer0DY6wxqwS5F1uGAT+P3mZWDo8QlP5bAGhcV8 ZLDcn5K8N0GgaygwUDUGBsUNAq0PSMm+xfAAn4Hg8HynCjZhA2mjwf8It7j4Rh5oF8e0dntrJ 3MgOHEvvQbW4MjxQP3VA== Received-SPF: pass client-ip=212.227.17.21; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.4 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Hello Guix! This is a patch series that updates libvirt to 7.1.0, now using the meson build system, and then updates a few dependent packages as well. Getting libvirt to build and then work properly was quite tedious, given that we have to build it so that the binaries refer to /etc and /var at runtime, while we set the prefix to the package output. This was relatively straight-forward with the old build system, but with meson I ended up having to patch meson.build so that: - It allows for localstatedir to not be relative to the prefix. And prevent it from trying to create empty directories in /var during installation. - It allows installing configurations, in /gnu/...-libvirt-7.1.0/etc/, but still refer to the system /etc at runtime. An alternative would be to not do any of the installation steps for /etc files, but doing that was more intrusive a change to the build system, and having those configurations installed could be useful examples, or referred to be services. Other than that, the rest is pretty straight-forward. I've tested this using the libvirt service and virt-manager, making sure I could still boot a VM. It's all working fine for me, although my use-case is quite simple, just the defaults: =2D-8<---------------cut here---------------start------------->8--- (services (cons* (service libvirt-service-type (libvirt-configuration (unix-sock-group "libvirt"))) ...)) =2D-8<---------------cut here---------------end--------------->8--- Let me know what you think and if that's good enough to apply! The definition is a bit more hacky than I'd like, so any ideas to improve it would be great. Thanks, Pierre Pierre Langlois (4): gnu: libvirt: Update to 7.1.0. gnu: python-libvirt: Update to 7.1.0. gnu: libvirt-glib: Update to 4.0.0. gnu: virt-manager: Update to 3.2.0. gnu/local.mk | 2 +- .../libvirt-create-machine-cgroup.patch | 48 -------- .../libvirt-do-not-create-var-dirs.patch | 30 +++++ gnu/packages/virtualization.scm | 106 ++++++++---------- 4 files changed, 76 insertions(+), 110 deletions(-) delete mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.patch create mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.pat= ch =2D-=20 2.31.0 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBWZ7QYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31Ut4MH/08J4vdIow+miAgtwDvFG1Ox Tk+EeoL/MgaOF5xOQoW3c555n044HbIcT2c8jhusJHuvTHm2wfeu++UWgaJ569U9 QdEuVzrqYloVqVSC20XP+DG/ySqIjWc6irPAQl7GvPAUjoP7XMi/qHZuaBlCYg74 ec71exsPUNMnaW1atL6JB53peE7DB5Uz6EE6nGsIMww6NUMpMXtAYmX2Lzr751G/ BIM+lxCXJiDxmZ/otPEdpje9DJxfFpnZjH8/zSiIVJ+V/ZZH4KNuk2JbNhkiF4Qb 2B7bs5e0NuqLDfp3LekBfcZiWDIZTg/oCo8HUELg6o2N/r9RnfPWsf1y++SLCIU= =ZqbC -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:31:48 2021 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:48 +0000 Received: from localhost ([127.0.0.1]:53225 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC5-0004r5-IH for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:48 -0400 Received: from mout.gmx.net ([212.227.17.20]:50755) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC3-0004qf-MU for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275889; bh=NdyNkQZFKASvGrpEEh3p2jEpI3tkSnaM4RBjgkY6VqQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=bpY1+rTWqsZLLshU9KoEw4hApXpXw5uc1GWSbUuWAHxLoFEZ/dlj7FTEdYgonqL7p 8J01kf5KtJaP1ENz60N9sJuUtVskM9RA+Ji/M6XF/o6cZ7wTUSeQh7xJ0dKDqLPAGz qbXC0qkNnkO+fjJX6on3OiJVze9bfWXXZFu6pKmE= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MBDj4-1lX2aN22gA-00Cjm4; Sat, 20 Mar 2021 22:31:29 +0100 From: Pierre Langlois To: 47285@debbugs.gnu.org Subject: [PATCH 2/4] gnu: python-libvirt: Update to 7.1.0. Date: Sat, 20 Mar 2021 21:31:23 +0000 Message-Id: <20210320213125.11295-2-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210320213125.11295-1-pierre.langlois@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> <20210320213125.11295-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:dR9j1YG5QwxJ6HwxnSlWmkocFsLXTLELd7PFAvJgtMmkJo472aA sQaiII/NGM4evXX7rszcK4pstxEgrHwu4JAkDECh6voCgJoqGfN1BKsSqNyuZAbKxnGHxtO MokaVPksEMoR+zTq8O3NRjbwbAS7a5YvxrLgSz9tlbvNSiyPVJ78S2kqtU7L3xeAvF7d33O SMTnOVf+SgmWvv8SnkpVA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:KaXfUtLOTlI=:nD3xvrjKdAO1IWjqy/UM3T ghJlV5l3Rtcr0q39UFUmrbX9as5fDikZlxAmd+flQOzWHIuUIuJEy9vdB3ogrtpmaLGnm28vP bnBgYNYGUFbb4zcjXdU8+bxqDDxGu19U9VvULksy8rsQf9TqkM7BK9pXN+JEcRX4/YQ94ojWN rbckKrOWNHtQ+a+w2ve47vWt5ScYyIeT8R9mynca04C2R945ezyTj+jIGZrgSj67XfcHm9Kxk EoLiXPBkOEI+udNQh6HJp9OvuIF7klkN0J1Saqcb/rqSbucige8ue4TaZWhwsxkdNyQ2w3O89 JhO101sV/vT5uhRGIU9Md19Kt9b+DQt8qR+0A0eAFXMf1A5Azq594/osM3EMqCEPGpEIAu4Un UiyZIWI1kzkU48a6MjL1K0H99Akmc8qH0HGtwcypGiiVMCjPkSYfkt5RtPU1PmczrVffXD9aG 5bIxENOKrjYswrgGcnZgFbZbNlPfYLhOQVk0VRkZLhzGMf9RQr/h04UJzQNkAyGccCveaHTzh lkgr4FkkFvTBwaiZNYL2Os7KZI2p4rU7J9+GtlgQUAPQqp6iX50oj7Rfh0+160MYfgSneJ8TG be2YDE8mDMMywFosQLoZqdwRMB1+FG7LNONOtsYwUK1722/0kkaqpAb6JpecEk2c4LAkaGiZR ijTBAuLt6eWofaq0lWnuYtH0t7XRWxZO12UtpJHKaFzMwiC77R8Hvib5uVz4sVvMp7CludT3g ex+sog4kGw/Eu4pX9FGXuH/m4OZJ851UCjHlVWlEmGKqpFJtKFwLaVUjP2pMdqn4Ec7nxY1Pt KF7lNmiKWUhQteHjJKJDx1WRiTx8Rvk1i8PfK63l2zbeBhefOEK1LXt7hUMw3cdvlvPWm6UyY VmbK8sNOvFLc4u7EilTbhMnzskwgWEYoriw3v+iV86xmIlBpQdmtH25DIBS2dxUsMSoB19HIo 5GlCGFeyfqnZbGlWqH4F8S2zKnjxAE5gSziiq/FtuSrlLuEdbgmS57QWUfWfWT9DymOJ9KWzj mC1WlyCSoupTsbzAJwO6FQF5NTpK9oXU0VjiMDpd5u7OEMl9cotw0Xf2SKlnQ4AUZH9nri+0Y n6eLcxknusD64Qao+MPpxxFq5jI37eviYrBUEP8cT6gBo0R7dtd5J1D78B7BzyEqGI8l3jpTp AHxNhpH84ABixHKVvsgpjhV1iy5Km4khKuIqAVAuFistuDSCKhaESYSLSGPAFMfOvEv2QrWki w1+wH+R9fYy/SmTcu X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47285 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (python-libvirt): Update to 7.1.0. =2D-- gnu/packages/virtualization.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index 86a95b77f1..399cfb544a 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1191,14 +1191,14 @@ three libraries: (define-public python-libvirt (package (name "python-libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/python/libvirt-py= thon-" version ".tar.gz")) (sha256 - (base32 "0kyz3lx49d8p75mvbzinxc1zgs8g7adn77y9bm15b8b4ad9zl5s6")))= ) + (base32 "0dq0qn0xx5hflaq5apj5pm79ba0wcl3w0j9klx8bg73z80gd7bzs")))= ) (build-system python-build-system) (arguments `(#:phases =2D- 2.31.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:31:48 2021 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:48 +0000 Received: from localhost ([127.0.0.1]:53228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCG-0004rN-8J for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:48 -0400 Received: from mout.gmx.net ([212.227.17.22]:58087) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC3-0004qd-97 for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275888; bh=PjB6VlbNrEWGsIV7ofNL826dHiwfGUh7QX1i0IlNy9w=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=IzhGRO0/wSQw4Jy5EVDc+E9/Ky6sih9uos4XttwSBT2FTdauHTzDuNQcmkH5/Z4nn ItWIFmjZC7eM2Phf9pIGR+9nsJPQGjvvWvcXoFuzjyfNlRTLDx1rJWTvg4OoU6bhbx lyvacWIrg0L2OB9SLVqefP44oHte6d+5tIe2Ngoc= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MS3mt-1lGk7X13pD-00TRoT; Sat, 20 Mar 2021 22:31:28 +0100 From: Pierre Langlois To: 47285@debbugs.gnu.org Subject: [PATCH 1/4] gnu: libvirt: Update to 7.1.0. Date: Sat, 20 Mar 2021 21:31:22 +0000 Message-Id: <20210320213125.11295-1-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <87o8fdwmdn.fsf@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:Xq2A1Igjr+FKbJEkQdh4mhAQhD745Id4+ljJ7r/xyR4Q4cJBkQb 4uzZkgsSEuljbOt3yINSqT4zqFRQOX8+1bMw9PWqSim1+/C/WDCsjV12xkDYKguEq1yDt+d +SBs/8Wxa0CiZF1++KO5FtG+LKusOAHPHI2nMWBJHOwWrHPt8GsFOHwNmyh1NWhLQP7GclJ JJe6KGmdEranuz3e9/w3w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:FbhrL3kWqQQ=:Jhz2xS0ZU8VKGEbRpJVEmA ziysGeDzQbdIuCWO6majY+WVaLBRh2eSjjWjAgv1hLVGR67Y3tTPiVWPN2xaIpL81VzCmRb3h cd2gM26cU+qbqBs65NwzST8sS+Sve65+AX0d3PX1gHXusM9Wx6t1o9OVvRgRXOtlVK/FmN7rA 0ETa577VgCCJk2e/QD0m0oKtGn//Jp+ZdWmZnz3EWn1lYXjak83TSnmuhCu7GgAVI6kv4mobh wylcfmaDKbcFmhKElDq1iEzAwacdcb1wyIOF/94mm2ji3EP2aNb0v3aBR/jvbMSfD7HLu0dYV jy5PJyjhCiQw/TOlGFPHNS/BMYwElaQDXFHfTY9HFzlKrPop1VhpSrFeyeG6cCWLVsH79Ug23 7uog/czi5SpCgHenIM4oY81mom1Ir4CfZN3GquWcNKBKanPJQWq844g6IECJb3Fcy4+z1rG2v bFttUBotUMi3DT0JxZ5YkV5GrZ7GjFwHlRmoxFebafTFsyQOqvLgtUttc73NngWa1of/bk+wp Syuu9L9na9L8yhG2YwuoE2ykEk2FQ4pNXhyit6nexQdhLtzuNfAGlqZFEKVu+qTwccdrDWFeM 0i0ttiHJXGBa4w63rAvlbNEBYWupeLmTzYh8XeTcJt1VhScReXcS7oQdgcAYot6xsODnMtthV 6g/GBBDHfbYjMwNM3T6avkt+ZNDX4p0HrfXkgD4A03Du++w6ABMpCNCDdSBshJn+T5ysM6JvE CmdvtGdLMOJmkhWGoV8aPvGFuAkZ6lVuHiEvWR2BB3ajokCRdDwOxADTdAlq8xreXRUu7nY+x WbYW9rWjFX2oXNyzE6nQEAFFjZ++GRc4LHtXn7F0LbIQKo86WW2rWAb7WDogqpMEXT5bUiobq vdBCap6jj63ehHerkR7Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47285 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (libvirt): Update to 7.1.0. [source]: Remove libvirt-create-machine-cgroup.patch, add libvirt-do-not-create-var-dirs.patch. [build-system]: Switch to meson-build-system. [arguments]: Use meson-0.55. Adapt #:configure-flags for meson, there is = no need for --docdir anymore. Remove fix-BOURNE_SHELL-definition phase. Add fix-sysconfdir-and-localstatedir phase. Adapt disable-broken-tests to mes= on. [native-inputs]: Add python-docutils and rpcsvc-proto. * gnu/packages/patches/libvirt-create-machine-cgroup.patch: Delete. * gnu/packages/patches/libvirt-do-not-create-var-dirs.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add new patch, remove the other. =2D-- gnu/local.mk | 2 +- .../libvirt-create-machine-cgroup.patch | 48 ------------ .../libvirt-do-not-create-var-dirs.patch | 30 +++++++ gnu/packages/virtualization.scm | 78 ++++++++----------- 4 files changed, 64 insertions(+), 94 deletions(-) delete mode 100644 gnu/packages/patches/libvirt-create-machine-cgroup.pat= ch create mode 100644 gnu/packages/patches/libvirt-do-not-create-var-dirs.pa= tch diff --git a/gnu/local.mk b/gnu/local.mk index 3d4147a879..cd755f5d67 100644 =2D-- a/gnu/local.mk +++ b/gnu/local.mk @@ -1257,7 +1257,7 @@ dist_patch_DATA =3D \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libffi-3.3-powerpc-fixes.patch \ %D%/packages/patches/libffi-float128-powerpc64le.patch \ - %D%/packages/patches/libvirt-create-machine-cgroup.patch \ + %D%/packages/patches/libvirt-do-not-create-var-dirs.patch \ %D%/packages/patches/libziparchive-add-includes.patch \ %D%/packages/patches/localed-xorg-keyboard.patch \ %D%/packages/patches/kdiagram-Fix-missing-link-libraries.patch \ diff --git a/gnu/packages/patches/libvirt-create-machine-cgroup.patch b/gn= u/packages/patches/libvirt-create-machine-cgroup.patch deleted file mode 100644 index 585ac237e1..0000000000 =2D-- a/gnu/packages/patches/libvirt-create-machine-cgroup.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9ca0b2955edea162b255b428e493cd8ffac52167 Mon Sep 17 00:00:00 2001 -From: =3D?UTF-8?q?Miguel=3D20=3DC3=3D81ngel=3D20Arruga=3D20Vivas?=3D - -Date: Fri, 1 Nov 2019 17:29:00 +0100 -Subject: [PATCH] vircgroup: Ensure /machine group is associated with its - parent. - -Call first virCgroupNew on the parent group virCgroupNewPartition if -it is available on before the creation of the child group. This -ensures that the creation of a first level group on the unified -architecture, as the check at virCgroupV2ParseControllersFile as the -parent file is there. - -Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=3D1760233 =2D--- - src/util/vircgroup.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c -index b46f20abfd..33c61f2d45 100644 =2D--- a/src/util/vircgroup.c -+++ b/src/util/vircgroup.c -@@ -855,9 +855,6 @@ virCgroupNewPartition(const char *path, - if (virCgroupSetPartitionSuffix(path, &newPath) < 0) - goto cleanup; - =2D- if (virCgroupNew(-1, newPath, NULL, controllers, group) < 0) =2D- goto cleanup; =2D- - if (STRNEQ(newPath, "/")) { - char *tmp; - parentPath =3D g_strdup(newPath); -@@ -868,7 +865,12 @@ virCgroupNewPartition(const char *path, - - if (virCgroupNew(-1, parentPath, NULL, controllers, &parent) < 0= ) - goto cleanup; -+ } - -+ if (virCgroupNew(-1, newPath, parent, controllers, group) < 0) -+ goto cleanup; -+ -+ if (parent) { - if (virCgroupMakeGroup(parent, *group, create, VIR_CGROUP_NONE) = < 0) - goto cleanup; - } =2D-- -2.23.0 - diff --git a/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch b/g= nu/packages/patches/libvirt-do-not-create-var-dirs.patch new file mode 100644 index 0000000000..640cb1696d =2D-- /dev/null +++ b/gnu/packages/patches/libvirt-do-not-create-var-dirs.patch @@ -0,0 +1,30 @@ +We define localstatedir as /var, and so we shouldn't be installing empty +directories there. + +diff --git a/src/meson.build b/src/meson.build +index f13b85b74e..58040f2c5d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -893,22 +893,6 @@ if conf.has('WITH_DTRACE_PROBES') + ) + endif + +- +-# Install empty directories +- +-virt_install_dirs +=3D [ +- localstatedir / 'cache' / 'libvirt', +- localstatedir / 'lib' / 'libvirt' / 'images', +- localstatedir / 'lib' / 'libvirt' / 'filesystems', +- localstatedir / 'lib' / 'libvirt' / 'boot', +-] +- +-meson.add_install_script( +- meson_python_prog.path(), python3_prog.path(), meson_install_dirs_prog= .path(), +- virt_install_dirs, +-) +- +- + # Check driver files + + if host_machine.system() =3D=3D 'linux' diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index fabac5b984..86a95b77f1 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -18,6 +18,7 @@ ;;; Copyright =C2=A9 2020, 2021 Maxim Cournoyer ;;; Copyright =C2=A9 2020 Brett Gilio ;;; Copyright =C2=A9 2021 Leo Famulari +;;; Copyright =C2=A9 2021 Pierre Langlois ;;; ;;; This file is part of GNU Guix. ;;; @@ -1065,64 +1066,49 @@ manage system or application containers.") (define-public libvirt (package (name "libvirt") - (version "5.8.0") + (version "7.1.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "0m8cqaqflvys5kaqpvb0qr4k365j09jc5xk6x70yvg8qkcl2hcz2")) + (base32 "0v50ckf56h6jd9bmqwp0lh2cmb7qqjmcb6y3mz2i2r15h06ih3w7")) (patches - (search-patches "libvirt-create-machine-cgroup.patch")))) - (build-system gnu-build-system) + (search-patches "libvirt-do-not-create-var-dirs.patch")))) + (build-system meson-build-system) (arguments - `(#:configure-flags - (list "--with-qemu" - "--with-qemu-user=3Dnobody" - "--with-qemu-group=3Dkvm" - "--with-polkit" - (string-append "--docdir=3D" (assoc-ref %outputs "out") "/sh= are/doc/" - ,name "-" ,version) - "--sysconfdir=3D/etc" - "--localstatedir=3D/var") + `(#:meson ,meson-0.55 ;; libvirt requires meson 0.54 or higher. + #:configure-flags + (list "-Ddriver_qemu=3Denabled" + "-Dqemu_user=3Dnobody" + "-Dqemu_group=3Dkvm" + "-Dpolkit=3Denabled") #:phases (modify-phases %standard-phases - (add-before 'configure 'fix-BOURNE_SHELL-definition - ;; BOURNE_SHELL is hard-#defined to =E2=80=98/bin/sh=E2=80=99,= causing test failures. + (add-after 'unpack 'fix-sysconfdir-and-localstatedir (lambda _ - (substitute* "config.h.in" - (("/bin/sh") (which "sh"))) - #t)) - (add-before 'configure 'patch-libtirpc-file-names - (lambda* (#:key inputs #:allow-other-keys) - ;; libvirt uses an m4 macro instead of pkg-config to determi= ne where - ;; the RPC headers are located. Tell it to look in the righ= t place. - (substitute* "configure" - (("/usr/include/tirpc") ;defined in m4/virt-xdr.m4 - (string-append (assoc-ref inputs "libtirpc") - "/include/tirpc"))) + (substitute* "meson.build" + ;; We set the prefix to be the package output, but we need + ;; localstatedir to be /var. Sadly the build system doesn= 't + ;; seem to allow that easily. + (("localstatedir =3D prefix / get_option\\('localstatedir'= \\)") + "localstatedir =3D get_option('localstatedir')") + ;; On the other hand, we keep sysconfdir using the prefix = so + ;; that we install configuration files in the package outp= ut. + ;; However, we need to make sure the C code refers to /etc= via + ;; SYSCONFDIR, and not the read-only configuration in the + ;; package output. + (("set_quoted\\('SYSCONFDIR', sysconfdir\\)") + "set_quoted('SYSCONFDIR', '/etc')")) #t)) (add-before 'configure 'disable-broken-tests (lambda _ - (let ((tests (list "commandtest" ; hangs idly - "qemuxml2argvtest" ; fails - "qemuhotplugtest" ; fails - "virnetsockettest" ; tries to network - "virshtest"))) ; fails - (substitute* "tests/Makefile.in" - (((format #f "(~a)\\$\\(EXEEXT\\)" (string-join tests "|= "))) - "")) - #t))) - (replace 'install - ;; Since the sysconfdir and localstatedir should be /etc and /= var - ;; at runtime, we must prevent writing to them at installation - ;; time. - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install" - "sysconfdir=3D/tmp/etc" - "localstatedir=3D/tmp/var" - make-flags)))))) + (substitute* "tests/meson.build" + (("\\{ 'name': 'commandtest'.*") "") ; hangs idly + (("\\{ 'name': 'qemuxml2argvtest'.*") "") ; fails + (("\\{ 'name': 'virnetsockettest'.*") "")) ; tries to net= work + #t))))) (inputs `(("libxml2" ,libxml2) ("eudev" ,eudev) @@ -1149,7 +1135,9 @@ manage system or application containers.") ("perl" ,perl) ("pkg-config" ,pkg-config) ("polkit" ,polkit) - ("python" ,python-wrapper))) + ("python" ,python-wrapper) + ("python-docutils" ,python-docutils) ;for rst2html + ("rpcsvc-proto" ,rpcsvc-proto))) ;for 'rpcgen' (home-page "https://libvirt.org") (synopsis "Simple API for virtualization") (description "Libvirt is a C toolkit to interact with the virtualizat= ion =2D- 2.31.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:31:49 2021 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:49 +0000 Received: from localhost ([127.0.0.1]:53230 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCG-0004rW-So for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:42529) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC4-0004qi-MR for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275891; bh=CZRrtC44jHLLzDIa4wdh1fzJ9O39IjE2jzb9hFQzgtY=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=VrSwKkeVnf5YBLVXtJY8qaeh9rgmcl+SxjglaELG0jccEgS+P8kwpJDoQJIkt/gEN x2QLrES7j82Esk4HYoiK4P1nps0MzUSFVBZW0IH1YTjK0/u8vsfQIl1uacubPaKfgk igBhDQGrkGNqqXxE3hA1SkwxrPOno5IhEwbbbT/Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1N0X8u-1lZuv035aW-00wTYY; Sat, 20 Mar 2021 22:31:30 +0100 From: Pierre Langlois To: 47285@debbugs.gnu.org Subject: [PATCH 3/4] gnu: libvirt-glib: Update to 4.0.0. Date: Sat, 20 Mar 2021 21:31:24 +0000 Message-Id: <20210320213125.11295-3-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210320213125.11295-1-pierre.langlois@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> <20210320213125.11295-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:eM2DoWONzLqXgSpV3RbiTxRemGo2KLY1B766rJ/TWeKVjTl/BIX mKfjuLb5hMfewLokk/Xp+6pWZOmJLEoESZ+A9atpcbtCSWP+ZwjH2oVD92hE+kjJoOu2ATf BOckPyrErRHt87Y4tAQkLBVFf3ziUZIZ7WoehIlK3iTVMQo60T1LWA0jH0P1emqPYgvK9cR Pfo1lxn+YPC83ll3COXDA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:MLxkuPmaX9I=:YFsm2Q1Ege4z/ZaXwnbokN j6ywo++O8j2zu2JwK3raHxRjZhFXcsEWFarV7Ej46JL6LEM5u9HMS3maA4Hyf2ebsuXZqDqYa 7WmkBuqGnWnMC4GVpktlH/vTyFeYIAkoOVIHYkvOOKTz/VH0NHzEcoK8EnDjFPoQ/S/9ZEI1v k+4Pivfu4tBHWdc8fuTJFyoE3IAMHhiL3qIIUj/y22xx3X7UqblJgrjhzOdjpXzgYIfkcBJss BsccN3rbm83fVGi9y0Zxh+l+sYHIvq6L1SEtdGmNNnYjuVtRttOJBm12i/Amnmm4td4boerZG KktIWsR1AxB8cfNF/OZAlhHSKYrMQ/YxF/UmKjuDfItGwK91VHI8x9AywqmqzwEKJOIsiyRkc wvwVWCmfDCvTCLx8jQGkZf1WAowCgmdZgVTv4hmGvYdEQ7vRB7Xm79JwfLnCGpt+IZBfLjJQQ 5i1zHxBxw80CM1ngEldYuQOqWY2O3uiZVLBJw/IonSN/KlUk3z6LG/MDaRfbQL5MoEfq3+PCQ /QSl7m5WlJ30sW7OBD3/cCTr6TZmbWY9ZGvS3z5asLh6MCotBc3kLZ5iIY3DOPuF1yuAQ2cYH o4km/onCmHNxqwtIczsevkRNu3zIIfzc+qtufrWX2d8/DjAXl2QQzh5/7OdC2bPWo9sUWfFwM 8ah5vBV3+QPpxGEiPqGhXqOzs0zveenj9Q3aqT2GZWgWIsV+3wdWOpoiNhocezK1V2BqbLg4L SxfrsDzNvywFLkbqxT5PcqEOdAOL+oVrlYXrAHx/soAp0MKklzps/IZAkRCO4JZ23ssrieeZX 3MS8XMQ5lNjZRnj9BrjBxxE7pX+C/DosxKR7lrkAZGzmw6WS9l5FRmWbmRZDQ6LFjyaUcSjca lGbWkxvLGHOMUP0QbCyw== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47285 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (libvirt-glib): Update to 4.0.0. [build-system]: Switch to meson-build-system. =2D-- gnu/packages/virtualization.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index 399cfb544a..97ca1fa0c8 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1149,15 +1149,15 @@ to integrate other virtualization mechanisms if ne= eded.") (define-public libvirt-glib (package (name "libvirt-glib") - (version "3.0.0") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "ftp://libvirt.org/libvirt/glib/" - "libvirt-glib-" version ".tar.gz")) + "libvirt-glib-" version ".tar.xz")) (sha256 (base32 - "1zpbv4ninc57c9rw4zmmkvvqn7154iv1qfr20kyxn8xplalqrzvz")))= ) - (build-system gnu-build-system) + "1gdcvqz88qkp402zra9csc6391f2xki1270x683n6ixakl3gf8w4")))= ) + (build-system meson-build-system) (inputs `(("openssl" ,openssl) ("cyrus-sasl" ,cyrus-sasl) =2D- 2.31.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:31:49 2021 Received: (at 47285) by debbugs.gnu.org; 20 Mar 2021 21:31:49 +0000 Received: from localhost ([127.0.0.1]:53232 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjCH-0004rd-5j for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:49 -0400 Received: from mout.gmx.net ([212.227.17.21]:54717) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjC5-0004qk-Ej for 47285@debbugs.gnu.org; Sat, 20 Mar 2021 17:31:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275891; bh=xrD/3IoQ7MUjHWt32zXxomN6ZStS4QFpYbEHiTnTqVE=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=D+rtv1nfiQsyg6RRDsuYEp/JXEClZ8zFcfiXJnDsEDuq9QiSerI+EJcOC1JUo+zEZ 5WnweqphzVD2HdJ3plgpXwZ4aUZ5cqvxipiHePks1xz4OhpVPBg6sL0TdyuuBvxXen P9BfQY5LrbdqQbGycM/5ZNJRSpWr3ZBuht83f4yI= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from localhost.localdomain ([82.69.64.142]) by mail.gmx.net (mrgmx104 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MwfWU-1lcek52m8w-00y7ie; Sat, 20 Mar 2021 22:31:31 +0100 From: Pierre Langlois To: 47285@debbugs.gnu.org Subject: [PATCH 4/4] gnu: virt-manager: Update to 3.2.0. Date: Sat, 20 Mar 2021 21:31:25 +0000 Message-Id: <20210320213125.11295-4-pierre.langlois@gmx.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210320213125.11295-1-pierre.langlois@gmx.com> References: <87o8fdwmdn.fsf@gmx.com> <20210320213125.11295-1-pierre.langlois@gmx.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:jcwIuNKbuidbFzfHkKH05gyjY2Hbcn5GhehsUQDmZ4VaGcqToWH NCi5nFdmTu4z2+tK2FKZ2YzGffqmZigeHVySec2RZ8FZyqI8TEXMXLL8w6BZoZXSlHsDKj8 iWO0uMVW5kJyr+UCHml+E3/SKrfSdABFxrxY24YTtWe51AtvRYNqoQimUTd4/BpY6t+Q6Bk jeMEl6abqPP0AMFSqk+ug== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:FAGapktN+UU=:fthfY95hD7ArSqMCVGHhUx AlGrBnkhO2RzECc9RSnNIY4SOUDDD4DTh0muiJBPxfypQ+bbWCsH8OuWWs9ByWCheif0irHPq nglrw9u/Co1/qoLs6hAevD77kaEh1OD1DW2FN9wWYXwQAmlPgAc1oqrP/c7e1ZAfkw3FjJNom C15RrYJFWzpc9GtDvC6CHo0DthDt+39Ux6JZFf8GdchS9wb8XI8Grdu074kbR81aKpJu2NImY m4TDF68XxCeiCBCw5hqyhVXjg8fqduC3uJ3e5f3wzRkyHY8eknnOqySTosWbruY0dqqtUFU19 4UeLGx11iwS7HHuHA5K1QmlE1svePLpoGBo13JuU0O9YK4a+88qJfocz4jQhIj6ykMLVLI/QB fPFK9Hu9BopPJ02S4q9OBqByZAYGcry8WnCx74ELlmSX9Mn5qabdpJyaSF9cQ/CMohm2opCn3 Y8PWq5/AW+oOA1/871x1uN9C+FFJtuUPzIdZywaVy1Kyj+pqTujJJBCtLXB+GJMEiGIqzs5Ub S+ev67X9IQhzGTC50lbK940Dk0JakSAx+U5wMdm3RHWsQ1lviScDkf8uOhdUAbKlHjfIkgMb9 Aq9uP8uIKsSr02OUcB4QAg6vq5BxiBvEGEy4cxmNJfDo/GTR4ZMUC+8MPAah2Lud4xVqYIbDb CkDgA2iEpB7mdx5IBFRDZ/c3mbz/sFQ5tgMKEAfC5s++MeanXWfHRQrskJdCvuvLnWvMu/5gb pIIc+OrgfxOP4Fsc+7pZ7tXG7JFK1b0vogD2PcMdvQChM1+uSiwSGz/ieJJwuc4dce/XWKfDK vKS632wO92HHyXYy8K20Ede+YG5D5N+F3juBgo16kMgXk9glpxekU+KhMKiCwuUwY8rBzBMdd iSRoou0bpubfZH+6aj6Q== X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47285 Cc: Pierre Langlois X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) * gnu/packages/virtualization.scm (virt-manager): Update to 3.2.0. [arguments]: Remove #:test-target. Remove fix-qemu-img-reference phase. Adapt check phase to use pytest, although they still do not run. [native-inputs]: Add python-docutils. Suggest adding python-pytest to ena= ble tests. =2D-- gnu/packages/virtualization.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization= .scm index 97ca1fa0c8..1df559aa5a 100644 =2D-- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1230,7 +1230,7 @@ virtualization library.") (define-public virt-manager (package (name "virt-manager") - (version "2.2.1") + (version "3.2.0") (source (origin (method url-fetch) (uri (string-append "https://virt-manager.org/download/sour= ces" @@ -1238,11 +1238,10 @@ virtualization library.") version ".tar.gz")) (sha256 (base32 - "06ws0agxlip6p6n3n43knsnjyd91gqhh2dadgc33wl9lx1k8vn6g")))= ) + "11kvpzcmyir91qz0dsnk7748jbb4wr8mrc744w117qc91pcy6vrb")))= ) (build-system python-build-system) (arguments `(#:use-setuptools? #f ; uses custom distutils 'install' co= mmand - #:test-target "test_ui" #:tests? #f ; TODO The tests currently fail ; RuntimeError: Loop condition wa= sn't ; met @@ -1260,12 +1259,6 @@ virtualization library.") (substitute* "virtinst/buildconfig.py" (("/usr") (assoc-ref outputs "out"))) #t)) - (add-after 'unpack 'fix-qemu-img-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "virtconv/formats.py" - (("/usr(/bin/qemu-img)" _ suffix) - (string-append (assoc-ref inputs "qemu") suffix))) - #t)) (add-after 'unpack 'fix-default-uri (lambda* (#:key inputs #:allow-other-keys) ;; Xen is not available for now - so only patch qemu. @@ -1296,11 +1289,12 @@ virtualization library.") (lambda* (#:key tests? #:allow-other-keys) (when tests? (setenv "HOME" "/tmp") + (setenv "XDG_CACHE_HOME" "/tmp") (system "Xvfb :1 &") (setenv "DISPLAY" ":1") ;; Dogtail requires that Assistive Technology support be e= nabled (setenv "GTK_MODULES" "gail:atk-bridge") - (invoke "dbus-run-session" "--" "python" "setup.py" "test_= ui")) + (invoke "dbus-run-session" "--" "pytest" "--uitests")) #t)) (add-after 'install 'glib-or-gtk-compile-schemas (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-s= chemas)) @@ -1330,7 +1324,9 @@ virtualization library.") ("gtk+" ,gtk+ "bin") ; gtk-update-icon-cache ("perl" ,perl) ; pod2man ("intltool" ,intltool) + ("rst2man" ,python-docutils) ;; The following are required for running the tests + ;; ("python-pytest" ,python-pytest) ;; ("python-dogtail" ,python-dogtail) ;; ("xvfb" ,xorg-server-for-tests) ;; ("dbus" ,dbus) =2D- 2.31.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Mar 20 17:32:45 2021 Received: (at submit) by debbugs.gnu.org; 20 Mar 2021 21:32:45 +0000 Received: from localhost ([127.0.0.1]:53239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjDB-0004td-Lu for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:32:45 -0400 Received: from lists.gnu.org ([209.51.188.17]:39786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lNjDA-0004tW-RZ for submit@debbugs.gnu.org; Sat, 20 Mar 2021 17:32:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36528) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjDA-00083i-L5 for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:44 -0400 Received: from mout.gmx.net ([212.227.17.22]:35863) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lNjD8-00032m-Qf for guix-patches@gnu.org; Sat, 20 Mar 2021 17:32:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1616275961; bh=Tna89xgK8rsRqXr4eHw3hcVDhggONXNF9KFHC+EZ+0Y=; h=X-UI-Sender-Class:References:From:To:Subject:In-reply-to:Date; b=CTToVHE0eQBMjHYU+rkOVQpKd/16IjoVszrIqgiLGillMoluU+EKgVACCdHrG8P2H kIJZ9DQivznj3grkLsk5B/lutBmoWbLYFu8elO5LVbrmYuDgu0UqJpmNxberfaPKnm nqLe+sF/qw/JeewxhOIFRTI5oPp9er1W323PcjLA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from labiere ([82.69.64.142]) by mail.gmx.net (mrgmx105 [212.227.17.174]) with ESMTPSA (Nemesis) id 1MWigq-1lCdMX1lW4-00X7nm for ; Sat, 20 Mar 2021 22:32:41 +0100 References: <87o8fdwmdn.fsf@gmx.com> User-agent: mu4e 1.4.15; emacs 27.1 From: Pierre Langlois To: Guix-patches Subject: Re: [PATCH 0/4] Update libvirt and friends. In-reply-to: <87o8fdwmdn.fsf@gmx.com> Date: Sat, 20 Mar 2021 21:32:40 +0000 Message-ID: <87im5lwlxj.fsf@gmx.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Provags-ID: V03:K1:r+u1y3yBcltKHiTFbCTJGkIwpYBRh52qQMh9ltILx9bXEKnWRYZ SYpXyEoJwH4kzCt2P4WjDtaTd3BGUOz/S3cgmzCDmSYWUrzEXOb9Ddq/7/xx87E5om957St Q9LE8ubqcvIgrmu44ETJ+8uew6mauaXIK3seAvLWxM2RU1/t7r5TKZELN+0WJ3isAzW26oS x/GtE3ndKEiY/8KLBtJww== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:OdT47+MzcZ4=:1q5QkMD8qC6qb/iHpVp5f3 jKMoB3Jm0TCGj+/vz9GB0XPAJvCpJFd96UFQyjB25A5NRVXBLDoW6NsIb+BNvHdabuDUVxwVC vtwqDvaMaPf1BXJMv2HWXPSXqAbBkawfnCVQ3NwMChQFOab9poYreYvET+OxtR7Z0UHyUgVt3 AnK1DY40Y3IHdxAFujXa3deBXmWZzSN6K3lKig8V23epEwPO4TLQKDK0ljW/vq1RsosrLjk6n m5ao1awnL5HFT6tb+g3cLoxUr9GmIZA/5z1EGu2zlT8AfW/MjOJ3bjzEjLAMQkz8yi9W8SE5q 8Jc//Hb6RosXiJe5OJpJaryySsVaUsk2s20b6zJhVUjH8aFj61/qCpG7jUCxHk3oF0JrKRbvu qblC6zWnp0iiuOXN/SjwjCnVzOCpN6oEftujLZePDJNkWeNliQRmUG/W0BfJG1LUgYj17f6VJ IjRrfahEpSts7IDGQWQeSNN+rNNEwSWI46/sV8JtQuxCjvcUOrp9PRKy5tcF0pmiQHFSwjdBg tqKdBFkPtws1c+nUcvuWdzbpaqw8a4HYFiycgd+gS3qJ1I4b9hkyn0mudLBH72pu/nTYrRZvR 6I8Z1WM6uYWwsAq0UlocKCWtGax5wkohs/ijpKhXH7+kO6DhQ+G3NvqjtpFJPRQnaTVZxdKLq 1gVzWOAfqRIhy9e6W1d1Jh47LbYWz+LMxr0VNrs/c9YxOA/wx/q8WO4tSLg980Rxy7TTQmy3q MQ3G4sfEJiNEGdiWjXnxo8ChuRiqklV2hmuI3If7aTnNlmtAIAs750tYCx2kk+Lul0oEd5eCQ St2mBtwGqAZLdU1A7Mo7SKz7aifbMR69cbsABrTgaAow9/mp3J/cV077URuzLzI896OPKxCqA AlPSXy2QTrWiRYX8wPCiETRO56uWO05Ee6fVZSVnk= Received-SPF: pass client-ip=212.227.17.22; envelope-from=pierre.langlois@gmx.com; helo=mout.gmx.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) --=-=-= Content-Type: text/plain Pierre Langlois writes: > Hello Guix! > > This is a patch series that updates libvirt to 7.1.0, now using the > meson build system, and then updates a few dependent packages as well. > > Getting libvirt to build and then work properly was quite tedious, given > that we have to build it so that the binaries refer to /etc and /var at > runtime, while we set the prefix to the package output. This was > relatively straight-forward with the old build system, but with meson I > ended up having to patch meson.build so that: > > - It allows for localstatedir to not be relative to the prefix. And > prevent it from trying to create empty directories in /var during > installation. > > - It allows installing configurations, in /gnu/...-libvirt-7.1.0/etc/, > but still refer to the system /etc at runtime. An alternative would > be to not do any of the installation steps for /etc files, but doing > that was more intrusive a change to the build system, and having > those configurations installed could be useful examples, or referred > to be services. > > Other than that, the rest is pretty straight-forward. I've tested this > using the libvirt service and virt-manager, making sure I could still > boot a VM. It's all working fine for me, although my use-case is quite > simple, just the defaults: Just after sending this, I realized we actually had a system test for the libvirt service, that works too :-). --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQFMBAEBCgA2FiEEctU9gYy29KFyWDdMqPyeRH9PfVQFAmBWafgYHHBpZXJyZS5s YW5nbG9pc0BnbXguY29tAAoJEKj8nkR/T31UGYkH/25kDtiVI8Q7fZSDm6ovzm78 mgIjEEW4dgV/9L/X77n+yPOwopYfZxPMmx9fCHU7Xn1jTEhBZGOCe+3yq6i9M+JQ ytAEl4KFuPZGl+9roUZ3J0d0CUsNYDN0OkTDMR9h3Tg5GgPrsMrKSKfKcjbfbBvw 3lE8FDDh7iVxCC9AfI9PmzK6EWiSNe6/sdL8WCiGnfT40+8I+DTyBlVV4QOr5N7s 86utp6PNHKj6ps/lPpir3maYUpQFUsz+0EjzMVtsHipRpNXbbrec8je2bFR2iCV1 EW3mHsyozMiHCu5gL7POZW2ZW9J/w9lZkz9Z6Udrk/jCPIZkdpuZa8i0AMgxZsE= =UpAD -----END PGP SIGNATURE----- --=-=-=-- From debbugs-submit-bounces@debbugs.gnu.org Wed Mar 31 09:28:48 2021 Received: (at 47285-done) by debbugs.gnu.org; 31 Mar 2021 13:28:48 +0000 Received: from localhost ([127.0.0.1]:53841 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRatr-0002nD-NX for submit@debbugs.gnu.org; Wed, 31 Mar 2021 09:28:48 -0400 Received: from eggs.gnu.org ([209.51.188.92]:54104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRatp-0002mw-0a for 47285-done@debbugs.gnu.org; Wed, 31 Mar 2021 09:28:45 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59746) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRatj-0002vQ-Hp; Wed, 31 Mar 2021 09:28:39 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=60456 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1lRati-0007B0-W8; Wed, 31 Mar 2021 09:28:39 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Pierre Langlois Subject: Re: bug#47285: [PATCH 0/4] Update libvirt and friends. References: <87o8fdwmdn.fsf@gmx.com> Date: Wed, 31 Mar 2021 15:28:36 +0200 In-Reply-To: <87o8fdwmdn.fsf@gmx.com> (Pierre Langlois's message of "Sat, 20 Mar 2021 21:23:00 +0000") Message-ID: <87czvfa1vf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 47285-done Cc: 47285-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Hi Pierre, Pierre Langlois skribis: > This is a patch series that updates libvirt to 7.1.0, now using the > meson build system, and then updates a few dependent packages as well. > > Getting libvirt to build and then work properly was quite tedious, given > that we have to build it so that the binaries refer to /etc and /var at > runtime, while we set the prefix to the package output. This was > relatively straight-forward with the old build system, but with meson I > ended up having to patch meson.build so that: > > - It allows for localstatedir to not be relative to the prefix. And > prevent it from trying to create empty directories in /var during > installation. > > - It allows installing configurations, in /gnu/...-libvirt-7.1.0/etc/, > but still refer to the system /etc at runtime. An alternative would > be to not do any of the installation steps for /etc files, but doing > that was more intrusive a change to the build system, and having > those configurations installed could be useful examples, or referred > to be services. > > Other than that, the rest is pretty straight-forward. I've tested this > using the libvirt service and virt-manager, making sure I could still > boot a VM. It's all working fine for me, although my use-case is quite > simple, just the defaults: > > (services (cons* > (service libvirt-service-type > (libvirt-configuration > (unix-sock-group "libvirt"))) > ...)) > > Let me know what you think and if that's good enough to apply! The > definition is a bit more hacky than I'd like, so any ideas to improve it > would be great. AFAICS it all works like a charm, including the system test :-), so I went ahead and applied the whole series. Thank you! Ludo=E2=80=99. From unknown Mon Jun 23 07:50:55 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 29 Apr 2021 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator