From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id cI8VDhROgGdvdgAAqHPOHw:P1 (envelope-from ) for ; Thu, 09 Jan 2025 22:30:44 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id cI8VDhROgGdvdgAAqHPOHw (envelope-from ) for ; Thu, 09 Jan 2025 23:30:44 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eug1DIpw; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Q7pQyO9o; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1736461843; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=rds459dgDHF9IP5JOiRHmyX+r6Oeu9JwyAgakQS9wJc=; b=uycxW4JtNXoSMbU7mJthwTAIySQtts0oPPeC+Vo+uRwkZLi1tGNkfI6/TTmsbJek/gNcLl 0k3adNrYqTJ2KkAMR10fG00Ul4861eh1lMhmb6Tv13mVhwRK4nSC4TvkywLSgRfw2uQSFH M4xv9+WYm+Y7viyLW6xdX9PTItyFKjdsaW6RHDv61auM+UgyY6MsCAlFEoOWiBI8eyCzXx ZIk2r5h4naW9Yr/kxhAssQ6esYpSV8SOPfcGiVcWPNdCncTmiVzTNR7c7Yykd9BdLIAoX0 RoZAyyhB+Qj5JvGL7Zi1gDM078kESOlVARHecXvVnnXgC7Xtt9FeKwoPOrz1iA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=eug1DIpw; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Q7pQyO9o; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Seal: i=1; s=key1; d=yhetil.org; t=1736461843; a=rsa-sha256; cv=none; b=E/prda9JKqWzSe7zDVyGuondnzJDqNcfUE5gTEfyOA5+n/vCFi8dvHGjEuJ+YUKhGnBICD TfDVLq7bK+Gef4AiBq0XYgA83MPiAF7LK6pboJQkNc3PFuLZmoLh6alKbvZYUTvG14G8PB IK4FcFOSt80tlGErDztM2Qfb2Tmt29f1Y5ByrE8wjJ5J2TdWtKWNzJ11mRJ2hY3LmLs3rM xbF4HLUCs4KwpJ/C/J9PU7efrE/gq4FFAC1zUHDrAuv1INSH+xE0kgUam3tbZg88D99n8b x0ivyohbUI+marm8yYw/K5AiNyJhwlI0pg8MMQ7KLaLLzDWm7W0iCSgZOClAjg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AA9C59824C for ; Thu, 09 Jan 2025 23:30:43 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tW12p-0008CQ-E2; Thu, 09 Jan 2025 17:30:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tW12n-0008AH-DK for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:25 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tW12m-0004SP-SE for guix-patches@gnu.org; Thu, 09 Jan 2025 17:30:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:References:In-Reply-To:To:Subject; bh=rds459dgDHF9IP5JOiRHmyX+r6Oeu9JwyAgakQS9wJc=; b=eug1DIpwQNn875+NtQO18QVPlo2titDDyXrrwLgAo+dgy0S8lgec+ceWDVVXoLWJFw1Y0QX0X5AChQ8QajIKM8oYm5wRzbswP5WxG3VW/lpxwIpfGZF/Ex0kocNDLOuiDUyPzWqCyxuh62nrGTkam5psnCgs8PAsWRTgnvWlEGy0JndmnUpTF4WTe698OMrE8rfmXnvfzQ+tRkqJC9BMiLbDAtZxyUGELhjmNx79mLChFgIckJyG+Y0cY/E9VqIpNCBmeMjLtOTbhYLkJEbBsF4yYGL2VipKtlYqjgvKlZlOALmnk0v9+Qr087bE0G3vtLZfthJCoyl2FscanC1hLQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tW12l-0001cj-Uw; Thu, 09 Jan 2025 17:30:23 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#75470] [PATCH gnome-team 13/59] gnu: libvirt: Update to 10.10.0. Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Thu, 09 Jan 2025 22:30:23 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 75470 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 75470@debbugs.gnu.org Cc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu X-Debbugs-Original-Xcc: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu Received: via spool by 75470-submit@debbugs.gnu.org id=B75470.17364618165884 (code B ref 75470); Thu, 09 Jan 2025 22:30:23 +0000 Received: (at 75470) by debbugs.gnu.org; 9 Jan 2025 22:30:16 +0000 Received: from localhost ([127.0.0.1]:54901 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tW12Z-0001Uc-Mb for submit@debbugs.gnu.org; Thu, 09 Jan 2025 17:30:15 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:50570) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tW12K-0001Or-Bi for 75470@debbugs.gnu.org; Thu, 09 Jan 2025 17:29:57 -0500 Received: by mail-wr1-x441.google.com with SMTP id ffacd0b85a97d-386329da1d9so797637f8f.1 for <75470@debbugs.gnu.org>; Thu, 09 Jan 2025 14:29:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736461790; x=1737066590; darn=debbugs.gnu.org; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:from:to:cc:subject:date :message-id:reply-to; bh=rds459dgDHF9IP5JOiRHmyX+r6Oeu9JwyAgakQS9wJc=; b=Q7pQyO9ohYnmCk5fd962ycjYnI0gA6pbTEnTMgvovncICSC9iZkhuTSdNoWw9rvySZ OJpQ7GF7HKl6jlAlHo7eqlsaBBUcXFZjV7CXRYE/3T+D4UUQq81igYtn4+AqGwK9sKQM beQQs5bFVX4xoQTw6agPFSsxyaBPbzL454CdvAXyAgTjKquQq8WqJleAYabxMgAD4QsX obT7LLsCX5C6prsVbEB+KMch/i/JdUXo51YOz7WFivvoMMTNDoP9XccPVCG78kRzqRBq hUCydlFZJg8un7cv2Hw2zBOXQdbjmtQ5Fet7acHyWcp1IUT04gsTopyXgww87+KShAB5 abSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736461790; x=1737066590; h=to:content-transfer-encoding:mime-version:subject:date:from :references:in-reply-to:message-id:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rds459dgDHF9IP5JOiRHmyX+r6Oeu9JwyAgakQS9wJc=; b=VUMy5Q9LhoyQPMmWBrdp29LTTRNtxD2vWW2UWu80BzqUBNx75BuIX009B4Tq+pNLCs epcnaF1FHUrSwb9lWdl1mnEs3Fp7b86sk7hxJzd+snxBE1JprXUyM+AT+QX3HFlFDrLA GcCe7GEe+BNX2nkhhOgk7OiQCC2vYNmJV7MmOh6lRly1JYQ9qoH5BkuIMbDJeNwCB44N EZVjo20EmeIHZdzQx2oTguaH5tJGa/Me4wZYmoMJNRfTH0AyxVARDWhrjx7+8PXDxnOG cHZJmoe9SBGzhJdpE1K/RhoBmSQdyEJ9VmCUVbtp5lH+HR5IVaNFt7dcDuIbari06iXh syFg== X-Gm-Message-State: AOJu0YwHYhmftXycebsIT7Dyy+eZC7ip6+ptFtg+FlwD+bHyVBXiKnlK nKPSTc+MASHveWgXpK9ItLtSyYNpDjYL/JQnSpSv4jmFo/mbipaLczGUiOL7 X-Gm-Gg: ASbGncusev0a7xbtny8JcjKB+GxO+305fmyMHgsU04JWAs8j3YzPxm0kdRsH86Xxp7x 1+R6h7G5642RFlGIYJtYOYDqzM5bXqNfVpzGnp7DX9zqVQB84TQi7bvf/ZTKPbb5sRNonR3ieHg yO5XA/hFHNdgLX/mS9iD4+7ZJuBFZHV6XY3/pc3UVSmYqmAHZsHDLxuNyBPRPLnKYCB8bQe+3Ho CMGLQu/2DpzBrjG0Uj5oEHnkidwNJRwxLKMlE3FWAJ0AjXBt8mIAI3+EINEIpKYsKKLtiDSjNkZ lJ+2SVNMRABVvqZUJUplpfWxzqI75clr X-Google-Smtp-Source: AGHT+IHULtylH7MqoP6W6Q/9O+uelObVpjr43ZW2yEL1+Apl6gWVaCOL/ShNjiTCv+9p+yQ8OfiVgQ== X-Received: by 2002:a05:6000:1f85:b0:386:4a0c:fe17 with SMTP id ffacd0b85a97d-38a872e9105mr7096799f8f.27.1736461790000; Thu, 09 Jan 2025 14:29:50 -0800 (PST) Received: from lumine.fritz.box (85-127-114-32.dsl.dynamic.surfer.at. [85.127.114.32]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-436e9dc895esm33120785e9.13.2025.01.09.14.29.49 for <75470@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jan 2025 14:29:49 -0800 (PST) Message-ID: In-Reply-To: References: From: Liliana Marie Prikler Date: Thu, 9 Jan 2025 22:38:04 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.39 X-Spam-Score: -1.39 X-Migadu-Queue-Id: AA9C59824C X-Migadu-Scanner: mx10.migadu.com X-TUID: LYHlKAsA8wjl * gnu/packages/virtualization.scm (libvirt): Update to 10.10.0. [#:phases]: Add ‘fix-test-data’. [inputs]: Add json-c. * gnu/packages/patches/libvirt-add-install-prefix.patch: Adjust accordingly. --- .../patches/libvirt-add-install-prefix.patch | 160 +++++++++++------- gnu/packages/virtualization.scm | 11 +- 2 files changed, 108 insertions(+), 63 deletions(-) diff --git a/gnu/packages/patches/libvirt-add-install-prefix.patch b/gnu/packages/patches/libvirt-add-install-prefix.patch index 9ad339d82f..041f39e097 100644 --- a/gnu/packages/patches/libvirt-add-install-prefix.patch +++ b/gnu/packages/patches/libvirt-add-install-prefix.patch @@ -2,20 +2,40 @@ Patch from NixOS: https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/libraries/libvirt/0001-meson-patch-in-an-install-prefix-for-building-on-nix.patch -From ad42041cfedcf25716429d2aad16641e0e2a012f Mon Sep 17 00:00:00 2001 +From 58c07f1d59ef683faf8b747e40bd75401306acf4 Mon Sep 17 00:00:00 2001 From: Euan Kemp -Date: Thu, 14 Jan 2021 00:32:00 -0800 +Date: Mon, 24 Jun 2024 15:59:48 +0200 Subject: [PATCH] meson: patch in an install prefix for building on nix Used in the nixpkgs version of libvirt so that we can install things in the nix store, but read them from the root filesystem. --- + meson.build | 9 +++++++ + meson_options.txt | 2 ++ + src/ch/meson.build | 6 ++--- + src/interface/meson.build | 2 +- + src/libxl/meson.build | 18 +++++++------- + src/locking/meson.build | 8 +++---- + src/lxc/meson.build | 10 ++++---- + src/meson.build | 18 +++++++------- + src/network/meson.build | 14 +++++------ + src/node_device/meson.build | 2 +- + src/nwfilter/meson.build | 6 ++--- + src/nwfilter/xml/meson.build | 2 +- + src/qemu/meson.build | 40 +++++++++++++++---------------- + src/remote/meson.build | 10 ++++---- + src/secret/meson.build | 4 ++-- + src/security/apparmor/meson.build | 8 +++---- + src/storage/meson.build | 6 ++--- + tools/meson.build | 2 +- + tools/ssh-proxy/meson.build | 2 +- + 19 files changed, 90 insertions(+), 79 deletions(-) diff --git a/meson.build b/meson.build -index 9016c0458a..b26e690194 100644 +index e98ab0d5ac..376f241c07 100644 --- a/meson.build +++ b/meson.build -@@ -39,6 +39,8 @@ if host_machine.system() == 'windows' +@@ -47,6 +47,8 @@ if host_machine.system() == 'windows' conf.set('WINVER', '0x0600') # Win Vista / Server 2008 endif @@ -24,7 +44,7 @@ index 9016c0458a..b26e690194 100644 # set various paths -@@ -57,6 +59,13 @@ else +@@ -65,6 +67,13 @@ else sysconfdir = prefix / get_option('sysconfdir') endif @@ -39,7 +59,7 @@ index 9016c0458a..b26e690194 100644 # sysconfdir as this makes a lot of things break in testing situations if prefix == '/usr' diff --git a/meson_options.txt b/meson_options.txt -index 5b43cdbd6b..e9dff18441 100644 +index cdc8687795..c2b6da140c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,5 @@ @@ -49,10 +69,10 @@ index 5b43cdbd6b..e9dff18441 100644 option('packager', type: 'string', value: '', description: 'Extra packager name') option('packager_version', type: 'string', value: '', description: 'Extra packager version') diff --git a/src/ch/meson.build b/src/ch/meson.build -index 66b77907b0..6aa9bbc548 100644 +index 633966aac7..c0ce823345 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build -@@ -64,8 +64,8 @@ if conf.has('WITH_CH') +@@ -74,8 +74,8 @@ if conf.has('WITH_CH') } virt_install_dirs += [ @@ -65,10 +85,10 @@ index 66b77907b0..6aa9bbc548 100644 ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build -index 828f274422..2a6b1f8c5e 100644 +index 3d2991315e..20f3266738 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build -@@ -56,6 +56,6 @@ if conf.has('WITH_INTERFACE') +@@ -59,6 +59,6 @@ if conf.has('WITH_INTERFACE') } virt_install_dirs += [ @@ -77,10 +97,10 @@ index 828f274422..2a6b1f8c5e 100644 ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build -index 0cc277db82..48d8c5b962 100644 +index e75a8f2fdb..d1800b4ea5 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build -@@ -79,14 +79,14 @@ if conf.has('WITH_LIBXL') +@@ -81,14 +81,14 @@ if conf.has('WITH_LIBXL') } virt_install_dirs += [ @@ -105,10 +125,10 @@ index 0cc277db82..48d8c5b962 100644 ] endif diff --git a/src/locking/meson.build b/src/locking/meson.build -index 72f7780438..abe70d20d5 100644 +index c3dfcf2961..cdc1442775 100644 --- a/src/locking/meson.build +++ b/src/locking/meson.build -@@ -238,14 +238,14 @@ if conf.has('WITH_LIBVIRTD') +@@ -249,14 +249,14 @@ if conf.has('WITH_LIBVIRTD') } virt_install_dirs += [ @@ -128,10 +148,10 @@ index 72f7780438..abe70d20d5 100644 endif endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build -index 99d4a34213..aae477c1ee 100644 +index bf9afabc0f..6e9547000a 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build -@@ -176,10 +176,10 @@ if conf.has('WITH_LXC') +@@ -190,10 +190,10 @@ if conf.has('WITH_LXC') } virt_install_dirs += [ @@ -148,10 +168,10 @@ index 99d4a34213..aae477c1ee 100644 ] endif diff --git a/src/meson.build b/src/meson.build -index b2d951d36c..305716010f 100644 +index dd2682ec19..b330d1159e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -210,7 +210,7 @@ openrc_init_files = [] +@@ -220,7 +220,7 @@ openrc_init_files = [] # virt_install_dirs: # list of directories to create during installation @@ -160,7 +180,7 @@ index b2d951d36c..305716010f 100644 # driver_source_files: # driver source files to check -@@ -663,7 +663,7 @@ endforeach +@@ -697,7 +697,7 @@ endforeach virt_conf_files += 'libvirt.conf' @@ -169,7 +189,7 @@ index b2d951d36c..305716010f 100644 install_data(virt_aug_files, install_dir: virt_aug_dir) # augeas_test_data: -@@ -723,7 +723,7 @@ foreach data : virt_daemon_confs +@@ -760,7 +760,7 @@ foreach data : virt_daemon_confs output: '@0@.conf'.format(data['name']), configuration: daemon_conf, install: true, @@ -178,7 +198,7 @@ index b2d951d36c..305716010f 100644 ) if data.get('with_ip', false) -@@ -847,7 +847,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -910,7 +910,7 @@ if conf.has('WITH_LIBVIRTD') install_data( init_file, @@ -187,7 +207,7 @@ index b2d951d36c..305716010f 100644 install_mode: 'rwxr-xr-x', rename: [ init['name'] ], ) -@@ -855,7 +855,7 @@ if conf.has('WITH_LIBVIRTD') +@@ -918,7 +918,7 @@ if conf.has('WITH_LIBVIRTD') if init.has_key('confd') install_data( init['confd'], @@ -196,7 +216,7 @@ index b2d951d36c..305716010f 100644 rename: [ init['name'] ], ) endif -@@ -882,10 +882,10 @@ endif +@@ -945,10 +945,10 @@ endif # Install empty directories virt_install_dirs += [ @@ -212,10 +232,10 @@ index b2d951d36c..305716010f 100644 meson.add_install_script( diff --git a/src/network/meson.build b/src/network/meson.build -index b5eff0c3ab..a0f26d624e 100644 +index 07cd5cda55..699309bb66 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -73,11 +73,11 @@ if conf.has('WITH_NETWORK') +@@ -115,11 +115,11 @@ if conf.has('WITH_NETWORK') } virt_install_dirs += [ @@ -232,26 +252,26 @@ index b5eff0c3ab..a0f26d624e 100644 ] configure_file( -@@ -85,12 +85,12 @@ if conf.has('WITH_NETWORK') +@@ -127,12 +127,12 @@ if conf.has('WITH_NETWORK') output: '@BASENAME@', - copy: true, + configuration: configmake_conf, install: true, - install_dir: confdir / 'qemu' / 'networks', + install_dir: install_prefix + confdir / 'qemu' / 'networks', ) meson.add_install_script( - meson_python_prog.path(), python3_prog.path(), meson_install_symlink_prog.path(), + meson_python_prog.full_path(), python3_prog.full_path(), meson_install_symlink_prog.full_path(), - confdir / 'qemu' / 'networks' / 'autostart', + install_prefix + confdir / 'qemu' / 'networks' / 'autostart', '../default.xml', 'default.xml', ) diff --git a/src/node_device/meson.build b/src/node_device/meson.build -index 1c95975c37..a7831242db 100644 +index d66c02a0e2..f883b65431 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build -@@ -64,6 +64,6 @@ if conf.has('WITH_NODE_DEVICES') +@@ -67,6 +67,6 @@ if conf.has('WITH_NODE_DEVICES') } virt_install_dirs += [ @@ -260,10 +280,10 @@ index 1c95975c37..a7831242db 100644 ] endif diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build -index 55cf8fcce4..d331086f2e 100644 +index de3d202267..346c435ee7 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build -@@ -62,9 +62,9 @@ if conf.has('WITH_NWFILTER') +@@ -65,9 +65,9 @@ if conf.has('WITH_NWFILTER') } virt_install_dirs += [ @@ -287,10 +307,10 @@ index 0d96c54ebe..66c92a1016 100644 -install_data(nwfilter_xml_files, install_dir: sysconfdir / 'libvirt' / 'nwfilter') +install_data(nwfilter_xml_files, install_dir: install_prefix + sysconfdir / 'libvirt' / 'nwfilter') diff --git a/src/qemu/meson.build b/src/qemu/meson.build -index 39f0f615cc..5f6f30f82b 100644 +index 907893d431..99b62c8955 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build -@@ -175,24 +175,24 @@ if conf.has('WITH_QEMU') +@@ -218,25 +218,25 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ @@ -311,6 +331,7 @@ index 39f0f615cc..5f6f30f82b 100644 - localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu' / 'dbus', +- runstatedir / 'libvirt' / 'qemu' / 'passt', - runstatedir / 'libvirt' / 'qemu' / 'slirp', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + install_prefix + confdir / 'qemu', @@ -330,15 +351,16 @@ index 39f0f615cc..5f6f30f82b 100644 + install_prefix + localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'dbus', ++ install_prefix + runstatedir / 'libvirt' / 'qemu' / 'passt', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'slirp', + install_prefix + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif diff --git a/src/remote/meson.build b/src/remote/meson.build -index b2aafe6320..6972d254ca 100644 +index 831acaaa01..0ba34d3bad 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build -@@ -235,9 +235,9 @@ if conf.has('WITH_REMOTE') +@@ -261,9 +261,9 @@ if conf.has('WITH_REMOTE') } virt_install_dirs += [ @@ -350,8 +372,8 @@ index b2aafe6320..6972d254ca 100644 + install_prefix + runstatedir / 'libvirt' / 'common', ] - logrotate_conf = configuration_data() -@@ -251,7 +251,7 @@ if conf.has('WITH_REMOTE') + logrotate_conf = configuration_data({ +@@ -278,7 +278,7 @@ if conf.has('WITH_REMOTE') ) install_data( log_file, @@ -360,7 +382,7 @@ index b2aafe6320..6972d254ca 100644 rename: [ name ], ) endforeach -@@ -301,7 +301,7 @@ endif +@@ -328,7 +328,7 @@ endif if conf.has('WITH_SASL') install_data( 'libvirtd.sasl', @@ -370,10 +392,10 @@ index b2aafe6320..6972d254ca 100644 ) endif diff --git a/src/secret/meson.build b/src/secret/meson.build -index 1bda59849b..392bc2cb2e 100644 +index 3b859ea7b4..ccddb3e805 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build -@@ -45,7 +45,7 @@ if conf.has('WITH_SECRETS') +@@ -48,7 +48,7 @@ if conf.has('WITH_SECRETS') } virt_install_dirs += [ @@ -384,10 +406,10 @@ index 1bda59849b..392bc2cb2e 100644 ] endif diff --git a/src/security/apparmor/meson.build b/src/security/apparmor/meson.build -index 990f00b4f3..e5a7a14e1d 100644 +index b9257c816d..98701755d8 100644 --- a/src/security/apparmor/meson.build +++ b/src/security/apparmor/meson.build -@@ -19,22 +19,22 @@ foreach name : apparmor_gen_profiles +@@ -57,7 +57,7 @@ foreach name : apparmor_gen_profiles output: name, configuration: apparmor_gen_profiles_conf, install: true, @@ -396,11 +418,14 @@ index 990f00b4f3..e5a7a14e1d 100644 ) endforeach - install_data( - [ 'libvirt-qemu', 'libvirt-lxc' ], -- install_dir: apparmor_dir / 'abstractions', -+ install_dir: install_prefix + apparmor_dir / 'abstractions', - ) +@@ -68,13 +68,13 @@ foreach name : apparmor_gen_abstractions + command: apparmor_gen_cmd, + capture: true, + install: true, +- install_dir: apparmor_dir / 'abstractions', ++ install_dir: install_prefix + apparmor_dir / 'abstractions', + ) + endforeach install_data( [ 'TEMPLATE.qemu', 'TEMPLATE.lxc' ], @@ -408,17 +433,21 @@ index 990f00b4f3..e5a7a14e1d 100644 + install_dir: install_prefix + apparmor_dir / 'libvirt', ) - install_data( - 'usr.lib.libvirt.virt-aa-helper.local', -- install_dir: apparmor_dir / 'local', -+ install_dir: install_prefix + apparmor_dir / 'local', - rename: 'usr.lib.libvirt.virt-aa-helper', - ) + if not conf.has('WITH_APPARMOR_3') +@@ -83,7 +83,7 @@ if not conf.has('WITH_APPARMOR_3') + # files in order to limit the amount of filesystem clutter. + install_data( + 'usr.lib.libvirt.virt-aa-helper.local', +- install_dir: apparmor_dir / 'local', ++ install_dir: install_prefix + apparmor_dir / 'local', + rename: 'usr.lib.libvirt.virt-aa-helper', + ) + endif diff --git a/src/storage/meson.build b/src/storage/meson.build -index 26e7ff1a1a..ad5c6eddc3 100644 +index 404d6a6941..fb4e67a0a8 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build -@@ -127,9 +127,9 @@ if conf.has('WITH_STORAGE') +@@ -126,9 +126,9 @@ if conf.has('WITH_STORAGE') } virt_install_dirs += [ @@ -432,10 +461,10 @@ index 26e7ff1a1a..ad5c6eddc3 100644 endif diff --git a/tools/meson.build b/tools/meson.build -index f4b4a16c29..059c73a955 100644 +index 1bb84be0be..e04a4e986d 100644 --- a/tools/meson.build +++ b/tools/meson.build -@@ -120,7 +120,7 @@ if conf.has('WITH_LOGIN_SHELL') +@@ -121,7 +121,7 @@ if conf.has('WITH_LOGIN_SHELL') install_rpath: libvirt_rpath, ) @@ -444,6 +473,17 @@ index f4b4a16c29..059c73a955 100644 endif if host_machine.system() == 'windows' +diff --git a/tools/ssh-proxy/meson.build b/tools/ssh-proxy/meson.build +index e9f312fa25..95d5d8fe0b 100644 +--- a/tools/ssh-proxy/meson.build ++++ b/tools/ssh-proxy/meson.build +@@ -20,6 +20,6 @@ if conf.has('WITH_SSH_PROXY') + output: '@BASENAME@', + configuration: tools_conf, + install: true, +- install_dir : sshconfdir, ++ install_dir : install_prefix + sshconfdir, + ) + endif -- -2.35.1 - +2.45.1 diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 158462b643..3588735fa3 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1545,14 +1545,14 @@ (define-public lxd (define-public libvirt (package (name "libvirt") - (version "8.6.0") + (version "10.10.0") (source (origin (method url-fetch) (uri (string-append "https://libvirt.org/sources/libvirt-" version ".tar.xz")) (sha256 - (base32 "1qisvbshbcd5305mrb4vni559k52id7c8iw4dwdydbf97b24f658")) + (base32 "15jpfrn3d2zyhbm5ip7bmpjb6ch2bfxm1h6yfgh0l3bw3g9ppgg1")) (patches (search-patches "libvirt-add-install-prefix.patch")))) (build-system meson-build-system) (arguments @@ -1597,7 +1597,11 @@ (define-public libvirt "virnetsockettest"))) ; tries to network (substitute* "tests/meson.build" (((format #f ".*'name': '(~a)'.*" (string-join tests "|"))) - "")))))))) + ""))))) + (add-before 'configure 'fix-test-data + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "tests/qemuvhostuserdata/usr/libexec") + (("^cat") (search-input-file inputs "bin/cat")))))))) (inputs (list acl attr @@ -1607,6 +1611,7 @@ (define-public libvirt libpciaccess gnutls dbus + json-c libpcap libnl libssh2 ;optional -- 2.47.1