[p2v PATCH 0/2] fix the spinner widget in the Live environment
Recently we've made GTK3 the sole GTK option; with that, the spinner widget is not displayed in the Live environment any more, at least when said environment is built on Fedora 35. It turns out we've been missing an obscure dependency. Laszlo Laszlo Ersek (2): Makefile.am: rectify target dependencies on package dependency files dependencies.m4: add librsvg2 Makefile.am | 4 ++-- dependencies.m4 | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-)
The targets whose recipes invoke "virt-p2v-make-disk" should depend on "$(dependencies_files)", and not "dependencies.m4". The reason is that "virt-p2v-make-disk" consumes the filtered / processed files, not the original dependency list. We have a separate rule that invokes m4 for generating "$(dependencies_files)" from "dependencies.m4"; we need to loop that in, so that "virt-p2v-make-disk" see up-to-date filtered files. Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 02ff1bb2eebd..2881fc947b24 100644 --- a/Makefile.am +++ b/Makefile.am @@ -328,7 +328,7 @@ $(BLANK_DISK): $(top_builddir)/run guestfish -N $@=part exit virt-p2v.img: \ - dependencies.m4 \ + $(dependencies_files) \ issue \ launch-virt-p2v \ p2v.service \ @@ -373,7 +373,7 @@ stamp-test-virt-p2v-pxe-data-files: \ touch $@ test-virt-p2v-pxe.img: \ - dependencies.m4 \ + $(dependencies_files) \ issue \ launch-virt-p2v \ p2v.service \
librsvg2 provides a plugin for GDK-Pixbuf, so that GDK-Pixbuf can load & render SVG images for GTK3, so that GTK3 can display the spinner for virt-p2v's Test Connection button. Clearly, this dependency chain is so trivial that no part of it has been necessary to codify in package metafiles. Therefore, the spinner icon ("/usr/share/icons/Adwaita/scalable-up-to-32/status/process-working-symbolic.svg") is currently not loaded / animated in our live environment. Compensate for this trainwreck in our "dependencies.m4" file. Package names taken from: - https://koji.fedoraproject.org/koji/packageinfo?packageID=274 - https://packages.debian.org/bullseye/librsvg2-2 - https://archlinux.org/packages/extra/x86_64/librsvg/ - https://software.opensuse.org/package/librsvg - https://openmandriva.pkgs.org/4.3/openmandriva-main-release-x86_64/librsvg-2... Thanks: Daniel Berrangé Thanks: Richard W.M. Jones <rjones@redhat.com> Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- dependencies.m4 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dependencies.m4 b/dependencies.m4 index b6d7db37287b..7356a64e7fc8 100644 --- a/dependencies.m4 +++ b/dependencies.m4 @@ -24,6 +24,7 @@ ifelse(REDHAT,1, dnl Used by the virt-p2v binary. pcre2 libxml2 + librsvg2 gtk3 dbus-libs @@ -68,6 +69,7 @@ ifelse(REDHAT,1, ifelse(DEBIAN,1, libpcre2-8-0 libxml2 + librsvg2-2 libgtk-3-0 libdbus-1-3 openssh-client @@ -88,6 +90,7 @@ ifelse(DEBIAN,1, ifelse(ARCHLINUX,1, pcre2 libxml2 + librsvg gtk3 dbus openssh @@ -110,6 +113,7 @@ ifelse(ARCHLINUX,1, ifelse(SUSE,1, pcre2 libxml2 + librsvg gtk3 libdbus-1-3 nbdkit-server @@ -135,6 +139,7 @@ ifelse(OPENMANDRIVA,1, dnl Used by the virt-p2v binary. pcre2 libxml2 + librsvg gtk3 dbus-libs
On 09/30/22 16:52, Laszlo Ersek wrote:
librsvg2 provides a plugin for GDK-Pixbuf, so that GDK-Pixbuf can load & render SVG images for GTK3, so that GTK3 can display the spinner for virt-p2v's Test Connection button.
Clearly, this dependency chain is so trivial that no part of it has been necessary to codify in package metafiles. Therefore, the spinner icon ("/usr/share/icons/Adwaita/scalable-up-to-32/status/process-working-symbolic.svg") is currently not loaded / animated in our live environment.
Compensate for this trainwreck in our "dependencies.m4" file.
Package names taken from: - https://koji.fedoraproject.org/koji/packageinfo?packageID=274 - https://packages.debian.org/bullseye/librsvg2-2 - https://archlinux.org/packages/extra/x86_64/librsvg/ - https://software.opensuse.org/package/librsvg - https://openmandriva.pkgs.org/4.3/openmandriva-main-release-x86_64/librsvg-2...
Thanks: Daniel Berrangé Thanks: Richard W.M. Jones <rjones@redhat.com>
I did make the acknowledgements uniform here (removing Rich's email address, to stick with the format seen elsewhere in the v2v projects' git logs), but then ended up formatting & posting the branch that didn't have that update. Sorry about that, I'll unify the format when I merge this. Laszlo
Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- dependencies.m4 | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/dependencies.m4 b/dependencies.m4 index b6d7db37287b..7356a64e7fc8 100644 --- a/dependencies.m4 +++ b/dependencies.m4 @@ -24,6 +24,7 @@ ifelse(REDHAT,1, dnl Used by the virt-p2v binary. pcre2 libxml2 + librsvg2 gtk3 dbus-libs
@@ -68,6 +69,7 @@ ifelse(REDHAT,1, ifelse(DEBIAN,1, libpcre2-8-0 libxml2 + librsvg2-2 libgtk-3-0 libdbus-1-3 openssh-client @@ -88,6 +90,7 @@ ifelse(DEBIAN,1, ifelse(ARCHLINUX,1, pcre2 libxml2 + librsvg gtk3 dbus openssh @@ -110,6 +113,7 @@ ifelse(ARCHLINUX,1, ifelse(SUSE,1, pcre2 libxml2 + librsvg gtk3 libdbus-1-3 nbdkit-server @@ -135,6 +139,7 @@ ifelse(OPENMANDRIVA,1, dnl Used by the virt-p2v binary. pcre2 libxml2 + librsvg gtk3 dbus-libs
_______________________________________________ Libguestfs mailing list Libguestfs@redhat.com https://listman.redhat.com/mailman/listinfo/libguestfs
For the series: Reviewed-by: Richard W.M. Jones <rjones@redhat.com> Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-builder quickly builds VMs from scratch http://libguestfs.org/virt-builder.1.html
participants (2)
-
Laszlo Ersek -
Richard W.M. Jones