7:30 a.m.
Upgrading to packages built with these patches applied results in
$ sudo dnf update ./*.rpm
Dependencies resolved.
===========================================================================
Package Version
===========================================================================
Upgrading:
libvirt 7.3.0-1.fc32
libvirt-client 7.3.0-1.fc32
replacing libvirt-bash-completion.x86_64 7.2.0-1.fc32
libvirt-daemon 7.3.0-1.fc32
replacing libvirt-admin.x86_64 7.2.0-1.fc32
replacing libvirt-bash-completion.x86_64 7.2.0-1.fc32
libvirt-daemon-config-network 7.3.0-1.fc32
libvirt-daemon-config-nwfilter 7.3.0-1.fc32
libvirt-daemon-driver-interface 7.3.0-1.fc32
libvirt-daemon-driver-libxl 7.3.0-1.fc32
libvirt-daemon-driver-lxc 7.3.0-1.fc32
libvirt-daemon-driver-network 7.3.0-1.fc32
libvirt-daemon-driver-nodedev 7.3.0-1.fc32
libvirt-daemon-driver-nwfilter 7.3.0-1.fc32
libvirt-daemon-driver-qemu 7.3.0-1.fc32
libvirt-daemon-driver-secret 7.3.0-1.fc32
libvirt-daemon-driver-storage 7.3.0-1.fc32
libvirt-daemon-driver-storage-core 7.3.0-1.fc32
libvirt-daemon-driver-storage-disk 7.3.0-1.fc32
libvirt-daemon-driver-storage-gluster 7.3.0-1.fc32
libvirt-daemon-driver-storage-iscsi 7.3.0-1.fc32
libvirt-daemon-driver-storage-iscsi-direct 7.3.0-1.fc32
libvirt-daemon-driver-storage-logical 7.3.0-1.fc32
libvirt-daemon-driver-storage-mpath 7.3.0-1.fc32
libvirt-daemon-driver-storage-rbd 7.3.0-1.fc32
libvirt-daemon-driver-storage-scsi 7.3.0-1.fc32
libvirt-daemon-driver-storage-sheepdog 7.3.0-1.fc32
libvirt-daemon-driver-storage-zfs 7.3.0-1.fc32
libvirt-daemon-driver-vbox 7.3.0-1.fc32
libvirt-daemon-kvm 7.3.0-1.fc32
libvirt-devel 7.3.0-1.fc32
libvirt-libs 7.3.0-1.fc32
libvirt-nss 7.3.0-1.fc32
Transaction Summary
===========================================================================
Upgrade 30 Packages
Total size: 8.2 M
Is this ok [y/N]
which is exactly what we were aiming for.
Changes from [v2]:
* move virt-admin to -daemon rather than -client;
* move other host-only tools from -client to -daemon;
* move systemtap probes from -client to -libs.
Changes from [v1]:
* add Obsoletes/Provides for a smooth transition.
[v2] https://listman.redhat.com/archives/libvir-list/2021-April/msg00613.html
[v1] https://listman.redhat.com/archives/libvir-list/2021-April/msg00604.html
Andrea Bolognani (4):
spec: Merge -admin package into -daemon
spec: Move some files from -client to -daemon
spec: Move systemtap probes from -client to -libs
spec: Drop -bash-completion package
libvirt.spec.in | 74 ++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 38 deletions(-)
--
2.26.3
7:30 a.m.
New subject: [libvirt PATCH v3 1/4] spec: Merge -admin package into -daemon
It's useful to have virt-admin around when debugging issues
with libvirtd, and since it's a tiny binary we can simply
include it in the -daemon package to ensure it's always going
to be available when needed.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index f9af330186..db88b1bf3d 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -430,6 +430,9 @@ Summary: Server side daemon and supporting files for libvirt library
# The client side, i.e. shared libs are in a subpackage
Requires: %{name}-libs = %{version}-%{release}
+# bash completion support for virt-admin
+Requires: %{name}-bash-completion = %{version}-%{release}
+
# (client invokes 'nc' against the UNIX socket on the server)
Requires: /usr/bin/nc
@@ -461,6 +464,10 @@ Requires: dbus
# For uid creation during pre
Requires(pre): shadow-utils
+# Ensure smooth upgrades
+Obsoletes: libvirt-admin < 7.3.0
+Provides: libvirt-admin
+
%description daemon
Server side daemon required to manage the virtualization capabilities
of recent versions of Linux. Requires a hypervisor specific sub-RPM
@@ -918,14 +925,6 @@ Requires: cyrus-sasl-gssapi
%description libs
Shared libraries for accessing the libvirt daemon.
-%package admin
-Summary: Set of tools to control libvirt daemon
-Requires: %{name}-libs = %{version}-%{release}
-Requires: %{name}-bash-completion = %{version}-%{release}
-
-%description admin
-The client side utilities to control the libvirt daemon.
-
%package bash-completion
Summary: Bash completion script
@@ -1589,12 +1588,16 @@ exit 0
%attr(0755, root, root) %{_sbindir}/virtlogd
%attr(0755, root, root) %{_sbindir}/virtlockd
+%{_mandir}/man1/virt-admin.1*
%{_mandir}/man8/libvirtd.8*
%{_mandir}/man8/virtlogd.8*
%{_mandir}/man8/virtlockd.8*
%{_mandir}/man8/virtproxyd.8*
%{_mandir}/man7/virkey*.7*
+%{_bindir}/virt-admin
+%{_datadir}/bash-completion/completions/virt-admin
+
%files daemon-config-network
%dir %{_datadir}/libvirt/networks/
%{_datadir}/libvirt/networks/default.xml
@@ -1911,11 +1914,6 @@ exit 0
%{_datadir}/libvirt/test-screenshot.png
-%files admin
-%{_mandir}/man1/virt-admin.1*
-%{_bindir}/virt-admin
-%{_datadir}/bash-completion/completions/virt-admin
-
%files bash-completion
%{_datadir}/bash-completion/completions/vsh
--
2.26.3
9:10 a.m.
New subject: [libvirt PATCH v3 1/4] spec: Merge -admin package into -daemon
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
It's useful to have virt-admin around when debugging issues
with libvirtd, and since it's a tiny binary we can simply
include it in the -daemon package to ensure it's always going
to be available when needed.
<rant>if it's useful then what's stopping mgmt apps from installing
it?</rant>
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 24 +++++++++++-------------
1 file changed, 11 insertions(+), 13 deletions(-)
Don't forget to remove corresponding section from
docs/kbase/rpm-deployment.rst.
Michal
10:39 a.m.
New subject: [libvirt PATCH v3 1/4] spec: Merge -admin package into -daemon
On Tue, 2021-04-20 at 16:10 +0200, Michal Privoznik wrote:
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
> It's useful to have virt-admin around when debugging issues
> with libvirtd, and since it's a tiny binary we can simply
> include it in the -daemon package to ensure it's always going
> to be available when needed.
<rant>if it's useful then what's stopping mgmt apps from installing
it?</rant>
I want to clarify my intent here: management apps could certainly
include the -admin package among their dependencies, but even if all
of them did that wouldn't help admins who are debugging standalone
virtualization hosts. And the virt-admin binary is so tiny that it
just feels silly to have a separate package for it.
Don't forget to remove corresponding section from
docs/kbase/rpm-deployment.rst.
I was not aware of that document! I'll update it :)
--
Andrea Bolognani / Red Hat / Virtualization
7:30 a.m.
New subject: [libvirt PATCH v3 2/4] spec: Move some files from -client to -daemon
The -client package's purpose is enabling remote machines to
connect to a virtualization host, but the virt-host-validate
and libvirt-guests tools are designed to be run directly on
the virtualization host and as such are a better fit for the
-daemon package.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index db88b1bf3d..5bdf12898f 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -463,6 +463,8 @@ Requires: numad
Requires: dbus
# For uid creation during pre
Requires(pre): shadow-utils
+# Needed by /usr/libexec/libvirt-guests.sh script.
+Requires: gettext
# Ensure smooth upgrades
Obsoletes: libvirt-admin < 7.3.0
@@ -904,8 +906,6 @@ capabilities of VirtualBox
%package client
Summary: Client side utilities of the libvirt library
Requires: %{name}-libs = %{version}-%{release}
-# Needed by /usr/libexec/libvirt-guests.sh script.
-Requires: gettext
# Needed by virt-pki-validate script.
Requires: gnutls-utils
Requires: %{name}-bash-completion = %{version}-%{release}
@@ -1533,6 +1533,7 @@ exit 0
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
%{_unitdir}/virtlockd-admin.socket
+%{_unitdir}/libvirt-guests.service
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
@@ -1542,6 +1543,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
%config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
@@ -1587,14 +1589,17 @@ exit 0
%attr(0755, root, root) %{_sbindir}/virtproxyd
%attr(0755, root, root) %{_sbindir}/virtlogd
%attr(0755, root, root) %{_sbindir}/virtlockd
+%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
%{_mandir}/man1/virt-admin.1*
+%{_mandir}/man1/virt-host-validate.1*
%{_mandir}/man8/libvirtd.8*
%{_mandir}/man8/virtlogd.8*
%{_mandir}/man8/virtlockd.8*
%{_mandir}/man8/virtproxyd.8*
%{_mandir}/man7/virkey*.7*
+%{_bindir}/virt-host-validate
%{_bindir}/virt-admin
%{_datadir}/bash-completion/completions/virt-admin
@@ -1877,11 +1882,9 @@ exit 0
%{_mandir}/man1/virsh.1*
%{_mandir}/man1/virt-xml-validate.1*
%{_mandir}/man1/virt-pki-validate.1*
-%{_mandir}/man1/virt-host-validate.1*
%{_bindir}/virsh
%{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate
-%{_bindir}/virt-host-validate
%{_datadir}/systemtap/tapset/libvirt_probes*.stp
%{_datadir}/systemtap/tapset/libvirt_functions.stp
@@ -1891,11 +1894,6 @@ exit 0
%{_datadir}/bash-completion/completions/virsh
-
-%{_unitdir}/libvirt-guests.service
-%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
-%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
-
%files libs -f %{name}.lang
%license COPYING COPYING.LESSER
%config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
--
2.26.3
9:10 a.m.
New subject: [libvirt PATCH v3 2/4] spec: Move some files from -client to -daemon
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
The -client package's purpose is enabling remote machines to
connect to a virtualization host, but the virt-host-validate
and libvirt-guests tools are designed to be run directly on
the virtualization host and as such are a better fit for the
-daemon package.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index db88b1bf3d..5bdf12898f 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -463,6 +463,8 @@ Requires: numad
Requires: dbus
# For uid creation during pre
Requires(pre): shadow-utils
+# Needed by /usr/libexec/libvirt-guests.sh script.
+Requires: gettext
# Ensure smooth upgrades
Obsoletes: libvirt-admin < 7.3.0
@@ -904,8 +906,6 @@ capabilities of VirtualBox
%package client
Summary: Client side utilities of the libvirt library
Requires: %{name}-libs = %{version}-%{release}
-# Needed by /usr/libexec/libvirt-guests.sh script.
-Requires: gettext
# Needed by virt-pki-validate script.
Requires: gnutls-utils
Requires: %{name}-bash-completion = %{version}-%{release}
@@ -1533,6 +1533,7 @@ exit 0
%{_unitdir}/virtlockd.service
%{_unitdir}/virtlockd.socket
%{_unitdir}/virtlockd-admin.socket
+%{_unitdir}/libvirt-guests.service
%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
%config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
Doesn't this mean that the %systemd_preun %systemd_post and
%systemd_postun machinery should be now done in -daemon instead of
-client? I mean, if -daemon installs a service file I don't see why
-client should refresh systemd's state.
Michal
10:41 a.m.
New subject: [libvirt PATCH v3 2/4] spec: Move some files from -client to -daemon
On Tue, 2021-04-20 at 16:10 +0200, Michal Privoznik wrote:
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
> %{_unitdir}/virtlockd.service
> %{_unitdir}/virtlockd.socket
> %{_unitdir}/virtlockd-admin.socket
> +%{_unitdir}/libvirt-guests.service
> %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
> %config(noreplace) %{_sysconfdir}/sysconfig/virtproxyd
> %config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
Doesn't this mean that the %systemd_preun %systemd_post and
%systemd_postun machinery should be now done in -daemon instead of
-client? I mean, if -daemon installs a service file I don't see why
-client should refresh systemd's state.
Good catch! I'll make sure the systemd-related snippets follow the
corresponding unit files.
--
Andrea Bolognani / Red Hat / Virtualization
7:30 a.m.
New subject: [libvirt PATCH v3 3/4] spec: Move systemtap probes from -client to -libs
Any application that uses the libraries can take advantage of
the systemtap probes, so they should be shipped in the -libs
package rather than in -client.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 5bdf12898f..0fec79c133 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -1886,12 +1886,6 @@ exit 0
%{_bindir}/virt-xml-validate
%{_bindir}/virt-pki-validate
-%{_datadir}/systemtap/tapset/libvirt_probes*.stp
-%{_datadir}/systemtap/tapset/libvirt_functions.stp
-%if %{with_qemu}
-%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
-%endif
-
%{_datadir}/bash-completion/completions/virsh
%files libs -f %{name}.lang
@@ -1906,6 +1900,12 @@ exit 0
%dir %{_datadir}/libvirt/schemas/
%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
+%{_datadir}/systemtap/tapset/libvirt_probes*.stp
+%{_datadir}/systemtap/tapset/libvirt_functions.stp
+%if %{with_qemu}
+%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
+%endif
+
%{_datadir}/libvirt/schemas/*.rng
%{_datadir}/libvirt/cpu_map/*.xml
--
2.26.3
7:30 a.m.
New subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package
The completion script is so tiny that it makes more sense to
potentially have two copies of it on disk than for it to have
its own package.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 0fec79c133..11abbb080e 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -430,9 +430,6 @@ Summary: Server side daemon and supporting files for libvirt library
# The client side, i.e. shared libs are in a subpackage
Requires: %{name}-libs = %{version}-%{release}
-# bash completion support for virt-admin
-Requires: %{name}-bash-completion = %{version}-%{release}
-
# (client invokes 'nc' against the UNIX socket on the server)
Requires: /usr/bin/nc
@@ -469,6 +466,7 @@ Requires: gettext
# Ensure smooth upgrades
Obsoletes: libvirt-admin < 7.3.0
Provides: libvirt-admin
+Obsoletes: libvirt-bash-completion < 7.3.0
%description daemon
Server side daemon required to manage the virtualization capabilities
@@ -908,7 +906,9 @@ Summary: Client side utilities of the libvirt library
Requires: %{name}-libs = %{version}-%{release}
# Needed by virt-pki-validate script.
Requires: gnutls-utils
-Requires: %{name}-bash-completion = %{version}-%{release}
+
+# Ensure smooth upgrades
+Obsoletes: libvirt-bash-completion < 7.3.0
%description client
The client binaries needed to access the virtualization
@@ -925,12 +925,6 @@ Requires: cyrus-sasl-gssapi
%description libs
Shared libraries for accessing the libvirt daemon.
-%package bash-completion
-Summary: Bash completion script
-
-%description bash-completion
-Bash completion script stub.
-
%if %{with_wireshark}
%package wireshark
Summary: Wireshark dissector plugin for libvirt RPC transactions
@@ -1296,6 +1290,17 @@ mv
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
%endif
%endif
+# Turning these symlinks into regular files allows us to make the
+# -client and -daemon packages, both of which need bash-completion
+# support, completely independent by only paying a tiny price in
+# terms of additional disk usage
+for cmd in virsh virt-admin; do
+ rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
+ cp $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh \
+ $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
+done
+rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh
+
%check
# Building on slow archs, like emulated s390x in Fedora copr, requires
# raising the test timeout
@@ -1912,9 +1917,6 @@ exit 0
%{_datadir}/libvirt/test-screenshot.png
-%files bash-completion
-%{_datadir}/bash-completion/completions/vsh
-
%if %{with_wireshark}
%files wireshark
%{wireshark_plugindir}/libvirt.so
--
2.26.3
9:10 a.m.
New subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
The completion script is so tiny that it makes more sense to
potentially have two copies of it on disk than for it to have
its own package.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
Don't forget to remove package description from
docs/kbase/rpm-deployment.rst.
Michal
9:18 a.m.
New subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package
On Tue, Apr 20, 2021 at 02:30:33PM +0200, Andrea Bolognani wrote:
The completion script is so tiny that it makes more sense to
potentially have two copies of it on disk than for it to have
its own package.
Signed-off-by: Andrea Bolognani <abologna(a)redhat.com>
---
libvirt.spec.in | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/libvirt.spec.in b/libvirt.spec.in
index 0fec79c133..11abbb080e 100644
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -430,9 +430,6 @@ Summary: Server side daemon and supporting files for libvirt library
# The client side, i.e. shared libs are in a subpackage
Requires: %{name}-libs = %{version}-%{release}
-# bash completion support for virt-admin
-Requires: %{name}-bash-completion = %{version}-%{release}
-
# (client invokes 'nc' against the UNIX socket on the server)
Requires: /usr/bin/nc
@@ -469,6 +466,7 @@ Requires: gettext
# Ensure smooth upgrades
Obsoletes: libvirt-admin < 7.3.0
Provides: libvirt-admin
+Obsoletes: libvirt-bash-completion < 7.3.0
%description daemon
Server side daemon required to manage the virtualization capabilities
@@ -908,7 +906,9 @@ Summary: Client side utilities of the libvirt library
Requires: %{name}-libs = %{version}-%{release}
# Needed by virt-pki-validate script.
Requires: gnutls-utils
-Requires: %{name}-bash-completion = %{version}-%{release}
+
+# Ensure smooth upgrades
+Obsoletes: libvirt-bash-completion < 7.3.0
%description client
The client binaries needed to access the virtualization
@@ -925,12 +925,6 @@ Requires: cyrus-sasl-gssapi
%description libs
Shared libraries for accessing the libvirt daemon.
-%package bash-completion
-Summary: Bash completion script
-
-%description bash-completion
-Bash completion script stub.
-
%if %{with_wireshark}
%package wireshark
Summary: Wireshark dissector plugin for libvirt RPC transactions
@@ -1296,6 +1290,17 @@ mv
$RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
%endif
%endif
+# Turning these symlinks into regular files allows us to make the
+# -client and -daemon packages, both of which need bash-completion
+# support, completely independent by only paying a tiny price in
+# terms of additional disk usage
+for cmd in virsh virt-admin; do
+ rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
+ cp $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh \
+ $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
+done
+rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh
IMHO this is not good. It results in a "virt-admin" completion
file that installs completions for "virsh", and vica-verca.
If we're going to separate them, then do it properly in the
source build, not the RPM.
+
%check
# Building on slow archs, like emulated s390x in Fedora copr, requires
# raising the test timeout
@@ -1912,9 +1917,6 @@ exit 0
%{_datadir}/libvirt/test-screenshot.png
-%files bash-completion
-%{_datadir}/bash-completion/completions/vsh
-
%if %{with_wireshark}
%files wireshark
%{wireshark_plugindir}/libvirt.so
--
2.26.3
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
10:43 a.m.
New subject: [libvirt PATCH v3 4/4] spec: Drop -bash-completion package
On Tue, 2021-04-20 at 15:18 +0100, Daniel P. Berrangé wrote:
On Tue, Apr 20, 2021 at 02:30:33PM +0200, Andrea Bolognani wrote:
> +# Turning these symlinks into regular files allows us to make the
> +# -client and -daemon packages, both of which need bash-completion
> +# support, completely independent by only paying a tiny price in
> +# terms of additional disk usage
> +for cmd in virsh virt-admin; do
> + rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
> + cp $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh \
> + $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/$cmd
> +done
> +rm -f $RPM_BUILD_ROOT%{_datadir}/bash-completion/completions/vsh
IMHO this is not good. It results in a "virt-admin" completion
file that installs completions for "virsh", and vica-verca.
If we're going to separate them, then do it properly in the
source build, not the RPM.
The current situation is exactly as you describe: the bash completion
file for both virsh and virt-admin also defines completion rules for
the other command, regardless of whether it's actually installed, so
this change wouldn't make the situation any worse.
But you're right, if we're touching it anyway might as well try to
make it better :)
--
Andrea Bolognani / Red Hat / Virtualization
9:10 a.m.
On 4/20/21 2:30 PM, Andrea Bolognani wrote:
Upgrading to packages built with these patches applied results in
$ sudo dnf update ./*.rpm
Dependencies resolved.
===========================================================================
Package Version
===========================================================================
Upgrading:
libvirt 7.3.0-1.fc32
libvirt-client 7.3.0-1.fc32
replacing libvirt-bash-completion.x86_64 7.2.0-1.fc32
libvirt-daemon 7.3.0-1.fc32
replacing libvirt-admin.x86_64 7.2.0-1.fc32
replacing libvirt-bash-completion.x86_64 7.2.0-1.fc32
libvirt-daemon-config-network 7.3.0-1.fc32
libvirt-daemon-config-nwfilter 7.3.0-1.fc32
libvirt-daemon-driver-interface 7.3.0-1.fc32
libvirt-daemon-driver-libxl 7.3.0-1.fc32
libvirt-daemon-driver-lxc 7.3.0-1.fc32
libvirt-daemon-driver-network 7.3.0-1.fc32
libvirt-daemon-driver-nodedev 7.3.0-1.fc32
libvirt-daemon-driver-nwfilter 7.3.0-1.fc32
libvirt-daemon-driver-qemu 7.3.0-1.fc32
libvirt-daemon-driver-secret 7.3.0-1.fc32
libvirt-daemon-driver-storage 7.3.0-1.fc32
libvirt-daemon-driver-storage-core 7.3.0-1.fc32
libvirt-daemon-driver-storage-disk 7.3.0-1.fc32
libvirt-daemon-driver-storage-gluster 7.3.0-1.fc32
libvirt-daemon-driver-storage-iscsi 7.3.0-1.fc32
libvirt-daemon-driver-storage-iscsi-direct 7.3.0-1.fc32
libvirt-daemon-driver-storage-logical 7.3.0-1.fc32
libvirt-daemon-driver-storage-mpath 7.3.0-1.fc32
libvirt-daemon-driver-storage-rbd 7.3.0-1.fc32
libvirt-daemon-driver-storage-scsi 7.3.0-1.fc32
libvirt-daemon-driver-storage-sheepdog 7.3.0-1.fc32
libvirt-daemon-driver-storage-zfs 7.3.0-1.fc32
libvirt-daemon-driver-vbox 7.3.0-1.fc32
libvirt-daemon-kvm 7.3.0-1.fc32
libvirt-devel 7.3.0-1.fc32
libvirt-libs 7.3.0-1.fc32
libvirt-nss 7.3.0-1.fc32
Transaction Summary
===========================================================================
Upgrade 30 Packages
Total size: 8.2 M
Is this ok [y/N]
which is exactly what we were aiming for.
Changes from [v2]:
* move virt-admin to -daemon rather than -client;
* move other host-only tools from -client to -daemon;
* move systemtap probes from -client to -libs.
Changes from [v1]:
* add Obsoletes/Provides for a smooth transition.
[v2] https://listman.redhat.com/archives/libvir-list/2021-April/msg00613.html
[v1] https://listman.redhat.com/archives/libvir-list/2021-April/msg00604.html
Andrea Bolognani (4):
spec: Merge -admin package into -daemon
spec: Move some files from -client to -daemon
spec: Move systemtap probes from -client to -libs
spec: Drop -bash-completion package
libvirt.spec.in | 74 ++++++++++++++++++++++++-------------------------
1 file changed, 36 insertions(+), 38 deletions(-)
A lot of work to have one management install virt-admin (when all they
could do is to put -admin package onto their list of RPMs to install).
But if you fix all nits I've pointed out then you can merge these:
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1312
days inactive
1312
days old
12 comments
3 participants
participants (3)
-
Andrea Bolognani -
Daniel P. Berrangé -
Michal Privoznik