[libvirt PATCH 0/3] meson: Fix RPM builds
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/461702102 The Ubuntu failures are due to connection issues and should be transient; all RPM builds passed. Andrea Bolognani (3): rpm: List one more directory meson: Sort virt_install_dirs meson: Add missing virt_install_dirs libvirt.spec.in | 1 + src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 8 +++++++- src/lxc/meson.build | 4 +++- src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 20 ++++++++++++++++---- src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 13 files changed, 58 insertions(+), 7 deletions(-) -- 2.34.1
Commit 4b43da0bff9b missed it. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4a56ace1d6..0cbdd45baf 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1910,6 +1910,7 @@ exit 0 %ghost %dir %{_rundir}/libvirt/qemu/ %ghost %dir %{_rundir}/libvirt/qemu/dbus/ %ghost %dir %{_rundir}/libvirt/qemu/slirp/ +%ghost %dir %{_rundir}/libvirt/qemu/swtpm/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/ %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/channel/target/ -- 2.34.1
This will make subsequent patches nicer. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/libxl/meson.build | 2 +- src/lxc/meson.build | 2 +- src/qemu/meson.build | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 8347a3c966..91696d3490 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -80,7 +80,7 @@ if conf.has('WITH_LIBXL') virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'libxl', - runstatedir / 'libvirt' / 'libxl', localstatedir / 'log' / 'libvirt' / 'libxl', + runstatedir / 'libvirt' / 'libxl', ] endif diff --git a/src/lxc/meson.build b/src/lxc/meson.build index c1f71b43e1..d399556abd 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -177,7 +177,7 @@ if conf.has('WITH_LXC') virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'lxc', - runstatedir / 'libvirt' / 'lxc', localstatedir / 'log' / 'libvirt' / 'lxc', + runstatedir / 'libvirt' / 'lxc', ] endif diff --git a/src/qemu/meson.build b/src/qemu/meson.build index 5f82f687c1..b23c96353f 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -174,12 +174,12 @@ if conf.has('WITH_QEMU') endif virt_install_dirs += [ - localstatedir / 'lib' / 'libvirt' / 'qemu', - runstatedir / 'libvirt' / 'qemu', localstatedir / 'cache' / 'libvirt' / 'qemu', - localstatedir / 'log' / 'libvirt' / 'qemu', + localstatedir / 'lib' / 'libvirt' / 'qemu', localstatedir / 'lib' / 'libvirt' / 'swtpm', - runstatedir / 'libvirt' / 'qemu' / 'swtpm', + localstatedir / 'log' / 'libvirt' / 'qemu', localstatedir / 'log' / 'swtpm' / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu', + runstatedir / 'libvirt' / 'qemu' / 'swtpm', ] endif -- 2.34.1
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: 4b43da0bff9b78dcf1189388d4c89e524238b41d Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 6 ++++++ src/lxc/meson.build | 2 ++ src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 12 ++++++++++++ src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 12 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/ch/meson.build b/src/ch/meson.build index a4bf0c6649..66b77907b0 100644 --- a/src/ch/meson.build +++ b/src/ch/meson.build @@ -65,6 +65,7 @@ if conf.has('WITH_CH') virt_install_dirs += [ localstatedir / 'lib' / 'libvirt' / 'ch', + localstatedir / 'log' / 'libvirt' / 'ch', runstatedir / 'libvirt' / 'ch', ] endif diff --git a/src/interface/meson.build b/src/interface/meson.build index f9f378aeb0..828f274422 100644 --- a/src/interface/meson.build +++ b/src/interface/meson.build @@ -54,4 +54,8 @@ if conf.has('WITH_INTERFACE') 'name': 'virtinterfaced', 'in_file': files('virtinterfaced.init.in') } + + virt_install_dirs += [ + runstatedir / 'libvirt' / 'interface', + ] endif diff --git a/src/libxl/meson.build b/src/libxl/meson.build index 91696d3490..0cc277db82 100644 --- a/src/libxl/meson.build +++ b/src/libxl/meson.build @@ -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', ] diff --git a/src/lxc/meson.build b/src/lxc/meson.build index d399556abd..99d4a34213 100644 --- a/src/lxc/meson.build +++ b/src/lxc/meson.build @@ -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', diff --git a/src/meson.build b/src/meson.build index fc6c77f5d1..3890df7124 100644 --- a/src/meson.build +++ b/src/meson.build @@ -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 diff --git a/src/network/meson.build b/src/network/meson.build index e7c43bc4c4..b5eff0c3ab 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -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', diff --git a/src/node_device/meson.build b/src/node_device/meson.build index 5013d825b3..1c95975c37 100644 --- a/src/node_device/meson.build +++ b/src/node_device/meson.build @@ -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 diff --git a/src/nwfilter/meson.build b/src/nwfilter/meson.build index ebbe712906..55cf8fcce4 100644 --- a/src/nwfilter/meson.build +++ b/src/nwfilter/meson.build @@ -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 diff --git a/src/qemu/meson.build b/src/qemu/meson.build index b23c96353f..3ea084cff8 100644 --- a/src/qemu/meson.build +++ b/src/qemu/meson.build @@ -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 diff --git a/src/remote/meson.build b/src/remote/meson.build index fc98d0e5be..b2aafe6320 100644 --- a/src/remote/meson.build +++ b/src/remote/meson.build @@ -236,6 +236,8 @@ if conf.has('WITH_REMOTE') virt_install_dirs += [ localstatedir / 'log' / 'libvirt', + runstatedir / 'libvirt', + runstatedir / 'libvirt' / 'common', ] logrotate_conf = configuration_data() diff --git a/src/secret/meson.build b/src/secret/meson.build index efc0ebb1e6..1bda59849b 100644 --- a/src/secret/meson.build +++ b/src/secret/meson.build @@ -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 diff --git a/src/storage/meson.build b/src/storage/meson.build index c43707461d..26e7ff1a1a 100644 --- a/src/storage/meson.build +++ b/src/storage/meson.build @@ -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') -- 2.34.1
On 2/2/22 13:28, Andrea Bolognani wrote:
Test pipeline: https://gitlab.com/abologna/libvirt/-/pipelines/461702102
The Ubuntu failures are due to connection issues and should be transient; all RPM builds passed.
Andrea Bolognani (3): rpm: List one more directory meson: Sort virt_install_dirs meson: Add missing virt_install_dirs
libvirt.spec.in | 1 + src/ch/meson.build | 1 + src/interface/meson.build | 4 ++++ src/libxl/meson.build | 8 +++++++- src/lxc/meson.build | 4 +++- src/meson.build | 2 +- src/network/meson.build | 2 ++ src/node_device/meson.build | 4 ++++ src/nwfilter/meson.build | 6 ++++++ src/qemu/meson.build | 20 ++++++++++++++++---- src/remote/meson.build | 2 ++ src/secret/meson.build | 5 +++++ src/storage/meson.build | 6 ++++++ 13 files changed, 58 insertions(+), 7 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
participants (2)
-
Andrea Bolognani -
Michal Prívozník