]>
Commit | Line | Data |
---|---|---|
9c616e1f JB |
1 | --- libvirt-8.8.0/meson.build.orig 2020-12-01 09:51:29.000000000 +0100 |
2 | +++ libvirt-8.8.0/meson.build 2022-06-15 21:02:52.949418900 +0200 | |
927caa3c | 3 | @@ -943,16 +943,19 @@ optional_programs = [ |
40a24f8b JB |
4 | ] |
5 | ||
6 | foreach name : optional_programs | |
7 | + varname = name.underscorify() | |
8 | + prog_path = get_option('@0@_path'.format(varname)) | |
9 | + if prog_path == '' | |
10 | prog = find_program(name, required: false, dirs: libvirt_sbin_path) | |
11 | - varname = name.underscorify() | |
12 | if prog.found() | |
13 | prog_path = prog.path() | |
14 | else | |
15 | prog_path = name | |
16 | endif | |
17 | + endif | |
18 | ||
19 | conf.set_quoted(varname.to_upper(), prog_path) | |
40a24f8b JB |
20 | - set_variable('@0@_prog'.format(varname), prog) |
21 | + set_variable('@0@_path'.format(varname), prog_path) | |
22 | endforeach | |
23 | ||
24 | ||
40a24f8b JB |
25 | @@ -1725,6 +1734,8 @@ if not get_option('driver_qemu').disable |
26 | conf.set_quoted('QEMU_USER', qemu_user) | |
27 | conf.set_quoted('QEMU_GROUP', qemu_group) | |
28 | ||
29 | + qemu_bridge_path = get_option('qemu_bridge_path') | |
30 | + if qemu_bridge_path == '' | |
31 | qemu_bridge_prog = find_program( | |
32 | 'qemu-bridge-helper', | |
33 | dirs: [ '/usr/libexec', '/usr/lib/qemu', '/usr/lib' ], | |
34 | @@ -1735,8 +1746,11 @@ if not get_option('driver_qemu').disable | |
35 | else | |
36 | qemu_bridge_path = '/usr/libexec/qemu-bridge-helper' | |
37 | endif | |
38 | + endif | |
39 | conf.set_quoted('QEMU_BRIDGE_HELPER', qemu_bridge_path) | |
40 | ||
41 | + qemu_pr_path = get_option('qemu_pr_path') | |
42 | + if qemu_pr_path == '' | |
43 | qemu_pr_prog = find_program( | |
44 | 'qemu-pr-helper', | |
45 | dirs: [ '/usr/bin', '/usr/libexec' ], | |
46 | @@ -1747,8 +1761,11 @@ if not get_option('driver_qemu').disable | |
47 | else | |
48 | qemu_pr_path = '/usr/bin/qemu-pr-helper' | |
49 | endif | |
50 | + endif | |
51 | conf.set_quoted('QEMU_PR_HELPER', qemu_pr_path) | |
52 | ||
53 | + qemu_slirp_path = get_option('qemu_slirp_path') | |
54 | + if qemu_slirp_path == '' | |
55 | qemu_slirp_prog = find_program( | |
56 | 'slirp-helper', | |
57 | dirs: [ '/usr/bin', '/usr/libexec' ], | |
58 | @@ -1759,8 +1776,11 @@ if not get_option('driver_qemu').disable | |
59 | else | |
60 | qemu_slirp_path = '/usr/bin/slirp-helper' | |
61 | endif | |
62 | + endif | |
63 | conf.set_quoted('QEMU_SLIRP_HELPER', qemu_slirp_path) | |
64 | ||
65 | + qemu_dbus_daemon_path = get_option('qemu_dbus_daemon_path') | |
66 | + if qemu_dbus_daemon_path == '' | |
67 | qemu_dbus_daemon_prog = find_program( | |
68 | 'dbus-daemon', | |
69 | dirs: [ '/usr/bin', '/usr/libexec' ], | |
70 | @@ -1771,6 +1791,7 @@ if not get_option('driver_qemu').disable | |
71 | else | |
72 | qemu_dbus_daemon_path = '/usr/bin/dbus-daemon' | |
73 | endif | |
74 | + endif | |
75 | conf.set_quoted('QEMU_DBUS_DAEMON', qemu_dbus_daemon_path) | |
76 | endif | |
77 | endif | |
78 | @@ -1850,11 +1871,29 @@ if conf.has('WITH_LIBVIRTD') | |
79 | endif | |
80 | ||
81 | if fs_enable | |
82 | + mount_path = get_option('mount_path') | |
83 | + if mount_path == '' | |
84 | mount_prog = find_program('mount', required: get_option('storage_fs'), dirs: libvirt_sbin_path) | |
85 | + if mount_prog.found() | |
86 | + mount_path = mount_prog.path() | |
87 | + endif | |
88 | + endif | |
89 | + umount_path = get_option('umount_path') | |
90 | + if umount_path == '' | |
91 | umount_prog = find_program('umount', required: get_option('storage_fs'), dirs: libvirt_sbin_path) | |
92 | + if umount_prog.found() | |
93 | + umount_path = umount_prog.path() | |
94 | + endif | |
95 | + endif | |
96 | + mkfs_path = get_option('mkfs_path') | |
97 | + if mkfs_path == '' | |
98 | mkfs_prog = find_program('mkfs', required: get_option('storage_fs'), dirs: libvirt_sbin_path) | |
99 | + if mkfs_prog.found() | |
100 | + mkfs_path = mkfs_prog.path() | |
101 | + endif | |
102 | + endif | |
103 | ||
104 | - if not mount_prog.found() or not umount_prog.found() or not mkfs_prog.found() | |
105 | + if mount_path == '' or umount_path == '' or mkfs_path == '' | |
106 | fs_enable = false | |
107 | endif | |
108 | endif | |
109 | @@ -1863,15 +1902,17 @@ if conf.has('WITH_LIBVIRTD') | |
110 | use_storage = true | |
111 | ||
112 | conf.set('WITH_STORAGE_FS', 1) | |
113 | - conf.set_quoted('MOUNT', mount_prog.path()) | |
114 | - conf.set_quoted('UMOUNT', umount_prog.path()) | |
115 | - conf.set_quoted('MKFS', mkfs_prog.path()) | |
116 | + conf.set_quoted('MOUNT', mount_path) | |
117 | + conf.set_quoted('UMOUNT', umount_path) | |
118 | + conf.set_quoted('MKFS', mkfs_path) | |
119 | ||
120 | + showmount_path = get_option('showmount_path') | |
121 | + if showmount_path == '' | |
122 | showmount_prog = find_program('showmount', required: false, dirs: libvirt_sbin_path) | |
123 | - showmount_path = '' | |
124 | if showmount_prog.found() | |
125 | showmount_path = showmount_prog.path() | |
126 | endif | |
127 | + endif | |
128 | conf.set_quoted('SHOWMOUNT', showmount_path) | |
129 | endif | |
130 | endif | |
131 | @@ -1883,7 +1924,7 @@ if conf.has('WITH_LIBVIRTD') | |
132 | error('Need glusterfs (libgfapi) for gluster storage driver') | |
133 | endif | |
134 | ||
135 | - if not get_option('storage_iscsi').disabled() and iscsiadm_prog.found() | |
136 | + if not get_option('storage_iscsi').disabled() and iscsiadm_path != '' | |
137 | use_storage = true | |
138 | conf.set('WITH_STORAGE_ISCSI', 1) | |
139 | elif get_option('storage_iscsi').enabled() | |
140 | @@ -1906,11 +1947,17 @@ if conf.has('WITH_LIBVIRTD') | |
141 | 'pvs', 'vgs', 'lvs', | |
142 | ] | |
143 | foreach name : lvm_progs | |
144 | + prog_path = get_option('@0@_path'.format(name)) | |
145 | + if prog_path == '' | |
146 | + prog = find_program(name, required: get_option('storage_lvm'), dirs: libvirt_sbin_path) | |
147 | + if prog.found() | |
148 | + prog_path = prog.path() | |
149 | + endif | |
150 | + endif | |
151 | set_variable( | |
152 | - '@0@_prog'.format(name), | |
153 | - find_program(name, required: get_option('storage_lvm'), dirs: libvirt_sbin_path) | |
154 | + '@0@_path'.format(name), prog_path | |
155 | ) | |
156 | - if not get_variable('@0@_prog'.format(name)).found() | |
157 | + if prog_path == '' | |
158 | lvm_enable = false | |
159 | endif | |
160 | endforeach | |
161 | @@ -1920,7 +1967,7 @@ if conf.has('WITH_LIBVIRTD') | |
162 | conf.set('WITH_STORAGE_LVM', 1) | |
163 | ||
164 | foreach name : lvm_progs | |
165 | - conf.set_quoted(name.to_upper(), get_variable('@0@_prog'.format(name)).path()) | |
166 | + conf.set_quoted(name.to_upper(), get_variable('@0@_path'.format(name))) | |
167 | endforeach | |
168 | endif | |
169 | endif | |
40a24f8b JB |
170 | @@ -2104,10 +2168,16 @@ if not get_option('nss').disabled() |
171 | endif | |
172 | ||
173 | if not get_option('numad').disabled() and numactl_dep.found() | |
174 | + numad_path = get_option('numad_path') | |
175 | + if numad_path == '' | |
176 | numad_prog = find_program('numad', required: get_option('numad'), dirs: libvirt_sbin_path) | |
177 | if numad_prog.found() | |
178 | + numad_path = numad_prog.path() | |
179 | + endif | |
180 | + endif | |
181 | + if numad_path != '' | |
182 | conf.set('WITH_NUMAD', 1) | |
183 | - conf.set_quoted('NUMAD', numad_prog.path()) | |
184 | + conf.set_quoted('NUMAD', numad_path) | |
185 | endif | |
186 | elif get_option('numad').enabled() | |
187 | error('You must have numactl enabled for numad support.') | |
188 | --- libvirt-6.10.0/build-aux/meson.build.orig 2020-12-01 09:51:29.000000000 +0100 | |
189 | +++ libvirt-6.10.0/build-aux/meson.build 2022-06-15 21:13:56.995821452 +0200 | |
927caa3c | 190 | @@ -1,7 +1,3 @@ syntax_check_conf = configuration_data() |
40a24f8b JB |
191 | -flake8_path = '' |
192 | -if flake8_prog.found() | |
193 | - flake8_path = flake8_prog.path() | |
194 | -endif | |
927caa3c JR |
195 | |
196 | if host_machine.system() == 'freebsd' or host_machine.system() == 'darwin' | |
197 | make_prog = find_program('gmake') | |
40a24f8b JB |
198 | --- libvirt-6.10.0/src/meson.build.orig 2020-12-01 09:51:29.000000000 +0100 |
199 | +++ libvirt-6.10.0/src/meson.build 2022-06-15 21:23:22.326092128 +0200 | |
200 | @@ -982,11 +982,11 @@ test( | |
201 | env: runutf8, | |
202 | ) | |
203 | ||
204 | -if augparse_prog.found() | |
205 | +if find_program('augparse', required: false).found() | |
206 | foreach data : augeas_test_data | |
207 | test( | |
208 | 'check-augeas-@0@'.format(data['name']), | |
209 | - augparse_prog, | |
210 | + find_program('augparse'), | |
211 | args: [ | |
212 | '-I', data['srcdir'], | |
213 | '-I', data['builddir'], | |
214 | @@ -996,7 +996,7 @@ if augparse_prog.found() | |
215 | endforeach | |
216 | endif | |
217 | ||
218 | -if pdwtags_prog.found() and cc.get_id() != 'clang' | |
219 | +if pdwtags_path != '' and cc.get_id() != 'clang' | |
220 | foreach proto : check_protocols | |
221 | lib = proto['lib'] | |
222 | test( | |
223 | @@ -1007,7 +1007,7 @@ if pdwtags_prog.found() and cc.get_id() | |
224 | proto['name'], | |
225 | lib.name(), | |
226 | lib.full_path(), | |
227 | - pdwtags_prog.path(), | |
228 | + pdwtags_path, | |
229 | files('@0@-structs'.format(proto['name'])), | |
230 | ], | |
231 | env: runutf8, | |
9c616e1f JB |
232 | --- libvirt-8.8.0/meson_options.txt.orig 2020-12-01 09:51:29.000000000 +0100 |
233 | +++ libvirt-8.8.0/meson_options.txt 2022-06-15 21:47:27.468263121 +0200 | |
234 | @@ -102,3 +102,50 @@ option('numad', type: 'feature', value: | |
40a24f8b JB |
235 | option('pm_utils', type: 'feature', value: 'auto', description: 'use pm-utils for power management') |
236 | option('sysctl_config', type: 'feature', value: 'auto', description: 'Whether to install sysctl configs') | |
237 | option('tls_priority', type: 'string', value: 'NORMAL', description: 'set the default TLS session priority string') | |
238 | + | |
239 | +option('addr2line_path', type: 'string', value: '', description: 'executable path') | |
240 | +option('augparse_path', type: 'string', value: '', description: 'executable path') | |
241 | +option('dmidecode_path', type: 'string', value: '', description: 'executable path') | |
242 | +option('dnsmasq_path', type: 'string', value: '', description: 'executable path') | |
243 | +option('ebtables_path', type: 'string', value: '', description: 'executable path') | |
244 | +option('flake8_path', type: 'string', value: '', description: 'executable path') | |
245 | +option('ip6tables_path', type: 'string', value: '', description: 'executable path') | |
246 | +option('ip_path', type: 'string', value: '', description: 'executable path') | |
247 | +option('iptables_path', type: 'string', value: '', description: 'executable path') | |
248 | +option('iscsiadm_path', type: 'string', value: '', description: 'executable path') | |
249 | +option('lvchange_path', type: 'string', value: '', description: 'executable path') | |
250 | +option('lvcreate_path', type: 'string', value: '', description: 'executable path') | |
251 | +option('lvremove_path', type: 'string', value: '', description: 'executable path') | |
252 | +option('lvs_path', type: 'string', value: '', description: 'executable path') | |
253 | +option('mdevctl_path', type: 'string', value: '', description: 'executable path') | |
254 | +option('mkfs_path', type: 'string', value: '', description: 'executable path') | |
255 | +option('mm_ctl_path', type: 'string', value: '', description: 'executable path') | |
256 | +option('modprobe_path', type: 'string', value: '', description: 'executable path') | |
257 | +option('mount_path', type: 'string', value: '', description: 'executable path') | |
258 | +option('numad_path', type: 'string', value: '', description: 'executable path') | |
259 | +option('ovs_vsctl_path', type: 'string', value: '', description: 'executable path') | |
260 | +option('parted_path', type: 'string', value: '', description: 'executable path') | |
261 | +option('pdwtags_path', type: 'string', value: '', description: 'executable path') | |
262 | +option('pvcreate_path', type: 'string', value: '', description: 'executable path') | |
263 | +option('pvremove_path', type: 'string', value: '', description: 'executable path') | |
264 | +option('pvs_path', type: 'string', value: '', description: 'executable path') | |
265 | +option('qemu_bridge_path', type: 'string', value: '', description: 'executable path') | |
266 | +option('qemu_dbus_daemon_path', type: 'string', value: '', description: 'executable path') | |
267 | +option('qemu_pr_path', type: 'string', value: '', description: 'executable path') | |
268 | +option('qemu_slirp_path', type: 'string', value: '', description: 'executable path') | |
269 | +option('radvd_path', type: 'string', value: '', description: 'executable path') | |
270 | +option('rmmod_path', type: 'string', value: '', description: 'executable path') | |
271 | +option('scrub_path', type: 'string', value: '', description: 'executable path') | |
40a24f8b JB |
272 | +option('showmount_path', type: 'string', value: '', description: 'executable path') |
273 | +option('tc_path', type: 'string', value: '', description: 'executable path') | |
274 | +option('udevadm_path', type: 'string', value: '', description: 'executable path') | |
275 | +option('umount_path', type: 'string', value: '', description: 'executable path') | |
276 | +option('vgchange_path', type: 'string', value: '', description: 'executable path') | |
277 | +option('vgcreate_path', type: 'string', value: '', description: 'executable path') | |
278 | +option('vgremove_path', type: 'string', value: '', description: 'executable path') | |
279 | +option('vgs_path', type: 'string', value: '', description: 'executable path') | |
280 | +option('vgscan_path', type: 'string', value: '', description: 'executable path') | |
281 | +option('vstorage_path', type: 'string', value: '', description: 'executable path') | |
282 | +option('vstorage_mount_path', type: 'string', value: '', description: 'executable path') | |
283 | +option('zfs_path', type: 'string', value: '', description: 'executable path') | |
284 | +option('zpool_path', type: 'string', value: '', description: 'executable path') |