|
 |
119c2d |
From f45c99be9258f2d97c1f19b93ae8f5e73f4cb486 Mon Sep 17 00:00:00 2001
|
|
|
119c2d |
Message-Id: <f45c99be9258f2d97c1f19b93ae8f5e73f4cb486@dist-git>
|
|
|
119c2d |
From: Jim Fehlig <jfehlig@suse.com>
|
|
|
119c2d |
Date: Mon, 10 Jan 2022 11:42:58 -0700
|
|
|
119c2d |
Subject: [PATCH] build: Only install libvirt-guests when building libvirtd
|
|
|
119c2d |
|
|
|
119c2d |
libvirt-guests was already moved to the libvirt daemon package in commit
|
|
|
119c2d |
d800c50349. It only needs to be installed when building libvirtd.
|
|
|
119c2d |
|
|
|
119c2d |
Signed-off-by: Jim Fehlig <jfehlig@suse.com>
|
|
|
119c2d |
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
119c2d |
(cherry picked from commit 3be5ba11a2c6fcb2dfdffa03ab4f847113f36b85)
|
|
|
119c2d |
|
|
|
119c2d |
https://bugzilla.redhat.com/show_bug.cgi?id=2042529
|
|
|
119c2d |
---
|
|
|
119c2d |
tools/meson.build | 38 ++++++++++++++++++++------------------
|
|
|
119c2d |
1 file changed, 20 insertions(+), 18 deletions(-)
|
|
|
119c2d |
|
|
|
119c2d |
diff --git a/tools/meson.build b/tools/meson.build
|
|
|
119c2d |
index 22fa3604ba..2d0aecb90b 100644
|
|
|
119c2d |
--- a/tools/meson.build
|
|
|
119c2d |
+++ b/tools/meson.build
|
|
|
119c2d |
@@ -297,29 +297,31 @@ if conf.has('WITH_SANLOCK')
|
|
|
119c2d |
)
|
|
|
119c2d |
endif
|
|
|
119c2d |
|
|
|
119c2d |
-configure_file(
|
|
|
119c2d |
- input: 'libvirt-guests.sh.in',
|
|
|
119c2d |
- output: '@BASENAME@',
|
|
|
119c2d |
- configuration: tools_conf,
|
|
|
119c2d |
- install: true,
|
|
|
119c2d |
- install_dir: libexecdir,
|
|
|
119c2d |
- install_mode: 'rwxrwxr-x',
|
|
|
119c2d |
-)
|
|
|
119c2d |
-
|
|
|
119c2d |
-if init_script == 'systemd'
|
|
|
119c2d |
- install_data(
|
|
|
119c2d |
- 'libvirt-guests.sysconf',
|
|
|
119c2d |
- install_dir: sysconfdir / 'sysconfig',
|
|
|
119c2d |
- rename: 'libvirt-guests',
|
|
|
119c2d |
- )
|
|
|
119c2d |
-
|
|
|
119c2d |
+if conf.has('WITH_LIBVIRTD')
|
|
|
119c2d |
configure_file(
|
|
|
119c2d |
- input: 'libvirt-guests.service.in',
|
|
|
119c2d |
+ input: 'libvirt-guests.sh.in',
|
|
|
119c2d |
output: '@BASENAME@',
|
|
|
119c2d |
configuration: tools_conf,
|
|
|
119c2d |
install: true,
|
|
|
119c2d |
- install_dir: prefix / 'lib' / 'systemd' / 'system',
|
|
|
119c2d |
+ install_dir: libexecdir,
|
|
|
119c2d |
+ install_mode: 'rwxrwxr-x',
|
|
|
119c2d |
)
|
|
|
119c2d |
+
|
|
|
119c2d |
+ if init_script == 'systemd'
|
|
|
119c2d |
+ install_data(
|
|
|
119c2d |
+ 'libvirt-guests.sysconf',
|
|
|
119c2d |
+ install_dir: sysconfdir / 'sysconfig',
|
|
|
119c2d |
+ rename: 'libvirt-guests',
|
|
|
119c2d |
+ )
|
|
|
119c2d |
+
|
|
|
119c2d |
+ configure_file(
|
|
|
119c2d |
+ input: 'libvirt-guests.service.in',
|
|
|
119c2d |
+ output: '@BASENAME@',
|
|
|
119c2d |
+ configuration: tools_conf,
|
|
|
119c2d |
+ install: true,
|
|
|
119c2d |
+ install_dir: prefix / 'lib' / 'systemd' / 'system',
|
|
|
119c2d |
+ )
|
|
|
119c2d |
+ endif
|
|
|
119c2d |
endif
|
|
|
119c2d |
|
|
|
119c2d |
if bash_completion_dep.found()
|
|
|
119c2d |
--
|
|
|
119c2d |
2.35.0
|
|
|
119c2d |
|