mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
meson: Add missing virt_install_dirs
We recently started listing these in the spec file and, since we
were not creating them during the installation phase, that broke
RPM builds.
Fixes: 4b43da0bff
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
parent
29b64dc610
commit
7627c96cdb
@ -65,6 +65,7 @@ if conf.has('WITH_CH')
|
|||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
localstatedir / 'lib' / 'libvirt' / 'ch',
|
localstatedir / 'lib' / 'libvirt' / 'ch',
|
||||||
|
localstatedir / 'log' / 'libvirt' / 'ch',
|
||||||
runstatedir / 'libvirt' / 'ch',
|
runstatedir / 'libvirt' / 'ch',
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
@ -54,4 +54,8 @@ if conf.has('WITH_INTERFACE')
|
|||||||
'name': 'virtinterfaced',
|
'name': 'virtinterfaced',
|
||||||
'in_file': files('virtinterfaced.init.in')
|
'in_file': files('virtinterfaced.init.in')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virt_install_dirs += [
|
||||||
|
runstatedir / 'libvirt' / 'interface',
|
||||||
|
]
|
||||||
endif
|
endif
|
||||||
|
@ -79,7 +79,13 @@ if conf.has('WITH_LIBXL')
|
|||||||
}
|
}
|
||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
|
confdir / 'libxl',
|
||||||
|
confdir / 'libxl' / 'autostart',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'libxl',
|
localstatedir / 'lib' / 'libvirt' / 'libxl',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'libxl' / 'channel' / 'target',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'libxl' / 'dump',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'libxl' / 'save',
|
||||||
localstatedir / 'log' / 'libvirt' / 'libxl',
|
localstatedir / 'log' / 'libvirt' / 'libxl',
|
||||||
runstatedir / 'libvirt' / 'libxl',
|
runstatedir / 'libvirt' / 'libxl',
|
||||||
]
|
]
|
||||||
|
@ -176,6 +176,8 @@ if conf.has('WITH_LXC')
|
|||||||
}
|
}
|
||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
|
confdir / 'lxc',
|
||||||
|
confdir / 'lxc' / 'autostart',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'lxc',
|
localstatedir / 'lib' / 'libvirt' / 'lxc',
|
||||||
localstatedir / 'log' / 'libvirt' / 'lxc',
|
localstatedir / 'log' / 'libvirt' / 'lxc',
|
||||||
runstatedir / 'libvirt' / 'lxc',
|
runstatedir / 'libvirt' / 'lxc',
|
||||||
|
@ -210,7 +210,7 @@ openrc_init_files = []
|
|||||||
|
|
||||||
# virt_install_dirs:
|
# virt_install_dirs:
|
||||||
# list of directories to create during installation
|
# list of directories to create during installation
|
||||||
virt_install_dirs = []
|
virt_install_dirs = [ confdir ]
|
||||||
|
|
||||||
# driver_source_files:
|
# driver_source_files:
|
||||||
# driver source files to check
|
# driver source files to check
|
||||||
|
@ -73,6 +73,8 @@ if conf.has('WITH_NETWORK')
|
|||||||
}
|
}
|
||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
|
confdir / 'qemu' / 'networks',
|
||||||
|
confdir / 'qemu' / 'networks' / 'autostart',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'network',
|
localstatedir / 'lib' / 'libvirt' / 'network',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
|
localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
|
||||||
runstatedir / 'libvirt' / 'network',
|
runstatedir / 'libvirt' / 'network',
|
||||||
|
@ -62,4 +62,8 @@ if conf.has('WITH_NODE_DEVICES')
|
|||||||
'name': 'virtnodedevd',
|
'name': 'virtnodedevd',
|
||||||
'in_file': files('virtnodedevd.init.in'),
|
'in_file': files('virtnodedevd.init.in'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virt_install_dirs += [
|
||||||
|
runstatedir / 'libvirt' / 'nodedev',
|
||||||
|
]
|
||||||
endif
|
endif
|
||||||
|
@ -61,5 +61,11 @@ if conf.has('WITH_NWFILTER')
|
|||||||
'in_file': files('virtnwfilterd.init.in'),
|
'in_file': files('virtnwfilterd.init.in'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virt_install_dirs += [
|
||||||
|
confdir / 'nwfilter',
|
||||||
|
runstatedir / 'libvirt' / 'nwfilter-binding',
|
||||||
|
runstatedir / 'libvirt' / 'nwfilter',
|
||||||
|
]
|
||||||
|
|
||||||
subdir('xml')
|
subdir('xml')
|
||||||
endif
|
endif
|
||||||
|
@ -174,12 +174,24 @@ if conf.has('WITH_QEMU')
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
|
confdir / 'qemu',
|
||||||
|
confdir / 'qemu' / 'autostart',
|
||||||
localstatedir / 'cache' / 'libvirt' / 'qemu',
|
localstatedir / 'cache' / 'libvirt' / 'qemu',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'qemu',
|
localstatedir / 'lib' / 'libvirt' / 'qemu',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'channel' / 'target',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'checkpoint',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'dump',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'nvram',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'ram',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'save',
|
||||||
|
localstatedir / 'lib' / 'libvirt' / 'qemu' / 'snapshot',
|
||||||
localstatedir / 'lib' / 'libvirt' / 'swtpm',
|
localstatedir / 'lib' / 'libvirt' / 'swtpm',
|
||||||
localstatedir / 'log' / 'libvirt' / 'qemu',
|
localstatedir / 'log' / 'libvirt' / 'qemu',
|
||||||
localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
|
localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
|
||||||
runstatedir / 'libvirt' / 'qemu',
|
runstatedir / 'libvirt' / 'qemu',
|
||||||
|
runstatedir / 'libvirt' / 'qemu' / 'dbus',
|
||||||
|
runstatedir / 'libvirt' / 'qemu' / 'slirp',
|
||||||
runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
runstatedir / 'libvirt' / 'qemu' / 'swtpm',
|
||||||
]
|
]
|
||||||
endif
|
endif
|
||||||
|
@ -236,6 +236,8 @@ if conf.has('WITH_REMOTE')
|
|||||||
|
|
||||||
virt_install_dirs += [
|
virt_install_dirs += [
|
||||||
localstatedir / 'log' / 'libvirt',
|
localstatedir / 'log' / 'libvirt',
|
||||||
|
runstatedir / 'libvirt',
|
||||||
|
runstatedir / 'libvirt' / 'common',
|
||||||
]
|
]
|
||||||
|
|
||||||
logrotate_conf = configuration_data()
|
logrotate_conf = configuration_data()
|
||||||
|
@ -43,4 +43,9 @@ if conf.has('WITH_SECRETS')
|
|||||||
'name': 'virtsecretd',
|
'name': 'virtsecretd',
|
||||||
'in_file': files('virtsecretd.init.in'),
|
'in_file': files('virtsecretd.init.in'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virt_install_dirs += [
|
||||||
|
confdir / 'secrets',
|
||||||
|
runstatedir / 'libvirt' / 'secrets',
|
||||||
|
]
|
||||||
endif
|
endif
|
||||||
|
@ -125,6 +125,12 @@ if conf.has('WITH_STORAGE')
|
|||||||
'name': 'virtstoraged',
|
'name': 'virtstoraged',
|
||||||
'in_file': files('virtstoraged.init.in'),
|
'in_file': files('virtstoraged.init.in'),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
virt_install_dirs += [
|
||||||
|
confdir / 'storage',
|
||||||
|
confdir / 'storage' / 'autostart',
|
||||||
|
runstatedir / 'libvirt' / 'storage',
|
||||||
|
]
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if conf.has('WITH_STORAGE_DISK')
|
if conf.has('WITH_STORAGE_DISK')
|
||||||
|
Loading…
Reference in New Issue
Block a user