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:
Andrea Bolognani 2022-02-02 11:35:51 +01:00
parent 29b64dc610
commit 7627c96cdb
12 changed files with 51 additions and 1 deletions

View File

@ -65,6 +65,7 @@ if conf.has('WITH_CH')
virt_install_dirs += [
localstatedir / 'lib' / 'libvirt' / 'ch',
localstatedir / 'log' / 'libvirt' / 'ch',
runstatedir / 'libvirt' / 'ch',
]
endif

View File

@ -54,4 +54,8 @@ if conf.has('WITH_INTERFACE')
'name': 'virtinterfaced',
'in_file': files('virtinterfaced.init.in')
}
virt_install_dirs += [
runstatedir / 'libvirt' / 'interface',
]
endif

View File

@ -79,7 +79,13 @@ if conf.has('WITH_LIBXL')
}
virt_install_dirs += [
confdir / 'libxl',
confdir / 'libxl' / 'autostart',
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',
runstatedir / 'libvirt' / 'libxl',
]

View File

@ -176,6 +176,8 @@ if conf.has('WITH_LXC')
}
virt_install_dirs += [
confdir / 'lxc',
confdir / 'lxc' / 'autostart',
localstatedir / 'lib' / 'libvirt' / 'lxc',
localstatedir / 'log' / 'libvirt' / 'lxc',
runstatedir / 'libvirt' / 'lxc',

View File

@ -210,7 +210,7 @@ openrc_init_files = []
# virt_install_dirs:
# list of directories to create during installation
virt_install_dirs = []
virt_install_dirs = [ confdir ]
# driver_source_files:
# driver source files to check

View File

@ -73,6 +73,8 @@ if conf.has('WITH_NETWORK')
}
virt_install_dirs += [
confdir / 'qemu' / 'networks',
confdir / 'qemu' / 'networks' / 'autostart',
localstatedir / 'lib' / 'libvirt' / 'network',
localstatedir / 'lib' / 'libvirt' / 'dnsmasq',
runstatedir / 'libvirt' / 'network',

View File

@ -62,4 +62,8 @@ if conf.has('WITH_NODE_DEVICES')
'name': 'virtnodedevd',
'in_file': files('virtnodedevd.init.in'),
}
virt_install_dirs += [
runstatedir / 'libvirt' / 'nodedev',
]
endif

View File

@ -61,5 +61,11 @@ if conf.has('WITH_NWFILTER')
'in_file': files('virtnwfilterd.init.in'),
}
virt_install_dirs += [
confdir / 'nwfilter',
runstatedir / 'libvirt' / 'nwfilter-binding',
runstatedir / 'libvirt' / 'nwfilter',
]
subdir('xml')
endif

View File

@ -174,12 +174,24 @@ if conf.has('WITH_QEMU')
endif
virt_install_dirs += [
confdir / 'qemu',
confdir / 'qemu' / 'autostart',
localstatedir / 'cache' / '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 / 'log' / 'libvirt' / 'qemu',
localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu',
runstatedir / 'libvirt' / 'qemu',
runstatedir / 'libvirt' / 'qemu' / 'dbus',
runstatedir / 'libvirt' / 'qemu' / 'slirp',
runstatedir / 'libvirt' / 'qemu' / 'swtpm',
]
endif

View File

@ -236,6 +236,8 @@ if conf.has('WITH_REMOTE')
virt_install_dirs += [
localstatedir / 'log' / 'libvirt',
runstatedir / 'libvirt',
runstatedir / 'libvirt' / 'common',
]
logrotate_conf = configuration_data()

View File

@ -43,4 +43,9 @@ if conf.has('WITH_SECRETS')
'name': 'virtsecretd',
'in_file': files('virtsecretd.init.in'),
}
virt_install_dirs += [
confdir / 'secrets',
runstatedir / 'libvirt' / 'secrets',
]
endif

View File

@ -125,6 +125,12 @@ if conf.has('WITH_STORAGE')
'name': 'virtstoraged',
'in_file': files('virtstoraged.init.in'),
}
virt_install_dirs += [
confdir / 'storage',
confdir / 'storage' / 'autostart',
runstatedir / 'libvirt' / 'storage',
]
endif
if conf.has('WITH_STORAGE_DISK')