[libvirt] [jenkins-ci PATCH 0/4] MinGW builds tweaks and fixes
Foreshadowed in https://www.redhat.com/archives/libvir-list/2018-April/msg01162.html Andrea Bolognani (4): guests: Add libvirt-glib+mingw project guests: Add virt-viewer+mingw project guests: Add icoutils dependency to virt-viewer+mingw guests: Rename gtk-vnc mapping to gtk-vnc2 guests/host_vars/libvirt-fedora-rawhide/main.yml | 2 ++ guests/vars/mappings.yml | 6 +++++- .../{libvirt-glib.yml => libvirt-glib+mingw.yml} | 2 -- guests/vars/projects/libvirt-glib.yml | 4 ---- .../{virt-viewer.yml => virt-viewer+mingw.yml} | 7 +------ guests/vars/projects/virt-viewer.yml | 24 +--------------------- 6 files changed, 9 insertions(+), 36 deletions(-) copy guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} (87%) copy guests/vars/projects/{virt-viewer.yml => virt-viewer+mingw.yml} (88%) -- 2.14.3
Just like libvirt+mingw, we want to keep the native toolchain and the MinGW one separate. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} | 2 -- guests/vars/projects/libvirt-glib.yml | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) copy guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} (87%) diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index c905fb0..9544ffe 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -9,6 +9,7 @@ projects: - libvirt-cim - libvirt-dbus - libvirt-glib + - libvirt-glib+mingw - libvirt-go - libvirt-go-xml - libvirt-perl diff --git a/guests/vars/projects/libvirt-glib.yml b/guests/vars/projects/libvirt-glib+mingw.yml similarity index 87% copy from guests/vars/projects/libvirt-glib.yml copy to guests/vars/projects/libvirt-glib+mingw.yml index abccb60..dec8e5c 100644 --- a/guests/vars/projects/libvirt-glib.yml +++ b/guests/vars/projects/libvirt-glib+mingw.yml @@ -4,9 +4,7 @@ packages: - gobject-introspection - gtk-doc - intltool - - libxml2 - mingw32-glib2 - mingw64-glib2 - mingw32-libxml2 - mingw64-libxml2 - - vala diff --git a/guests/vars/projects/libvirt-glib.yml b/guests/vars/projects/libvirt-glib.yml index abccb60..13a5128 100644 --- a/guests/vars/projects/libvirt-glib.yml +++ b/guests/vars/projects/libvirt-glib.yml @@ -5,8 +5,4 @@ packages: - gtk-doc - intltool - libxml2 - - mingw32-glib2 - - mingw64-glib2 - - mingw32-libxml2 - - mingw64-libxml2 - vala -- 2.14.3
On Mon, Apr 16, 2018 at 06:47:53PM +0200, Andrea Bolognani wrote:
Just like libvirt+mingw, we want to keep the native toolchain and the MinGW one separate.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} | 2 -- guests/vars/projects/libvirt-glib.yml | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) copy guests/vars/projects/{libvirt-glib.yml => libvirt-glib+mingw.yml} (87%)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
Just like libvirt+mingw and libvirt-glib+mingw, we want to keep the native toolchain and the MinGW one separate. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + .../{virt-viewer.yml => virt-viewer+mingw.yml} | 6 ------ guests/vars/projects/virt-viewer.yml | 22 ---------------------- 3 files changed, 1 insertion(+), 28 deletions(-) copy guests/vars/projects/{virt-viewer.yml => virt-viewer+mingw.yml} (88%) diff --git a/guests/host_vars/libvirt-fedora-rawhide/main.yml b/guests/host_vars/libvirt-fedora-rawhide/main.yml index 9544ffe..43555d0 100644 --- a/guests/host_vars/libvirt-fedora-rawhide/main.yml +++ b/guests/host_vars/libvirt-fedora-rawhide/main.yml @@ -20,3 +20,4 @@ projects: - osinfo-db-tools - virt-manager - virt-viewer + - virt-viewer+mingw diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer+mingw.yml similarity index 88% copy from guests/vars/projects/virt-viewer.yml copy to guests/vars/projects/virt-viewer+mingw.yml index f26ebff..f14de5b 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer+mingw.yml @@ -1,11 +1,7 @@ --- packages: - glib2 - - gtk-vnc - - gtk3 - intltool - - libgovirt - - libxml2 - mingw32-glib2 - mingw32-glib-networking - mingw32-gstreamer1-plugins-bad-free @@ -28,5 +24,3 @@ packages: - mingw64-rest - mingw64-spice-gtk3 - mingw64-usbredir - - spice-gtk3 - - xmllint diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml index f26ebff..6f3dbf9 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer.yml @@ -6,27 +6,5 @@ packages: - intltool - libgovirt - libxml2 - - mingw32-glib2 - - mingw32-glib-networking - - mingw32-gstreamer1-plugins-bad-free - - mingw32-gstreamer1-plugins-good - - mingw32-gtk3 - - mingw32-gtk-vnc2 - - mingw32-libgovirt - - mingw32-libusbx - - mingw32-rest - - mingw32-spice-gtk3 - - mingw32-usbredir - - mingw64-glib2 - - mingw64-glib-networking - - mingw64-gstreamer1-plugins-bad-free - - mingw64-gstreamer1-plugins-good - - mingw64-gtk3 - - mingw64-gtk-vnc2 - - mingw64-libgovirt - - mingw64-libusbx - - mingw64-rest - - mingw64-spice-gtk3 - - mingw64-usbredir - spice-gtk3 - xmllint -- 2.14.3
On Mon, Apr 16, 2018 at 06:47:54PM +0200, Andrea Bolognani wrote:
Just like libvirt+mingw and libvirt-glib+mingw, we want to keep the native toolchain and the MinGW one separate.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/host_vars/libvirt-fedora-rawhide/main.yml | 1 + .../{virt-viewer.yml => virt-viewer+mingw.yml} | 6 ------ guests/vars/projects/virt-viewer.yml | 22 ---------------------- 3 files changed, 1 insertion(+), 28 deletions(-) copy guests/vars/projects/{virt-viewer.yml => virt-viewer+mingw.yml} (88%)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
The package is not needed for native builds, but MinGW builds require it to be installed. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-viewer+mingw.yml | 1 + 2 files changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 1b88be0..1c1a872 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -173,6 +173,10 @@ mappings: hal: FreeBSD: hal + icoutils: + default: icoutils + CentOS6: + intltool: default: intltool diff --git a/guests/vars/projects/virt-viewer+mingw.yml b/guests/vars/projects/virt-viewer+mingw.yml index f14de5b..be16f2c 100644 --- a/guests/vars/projects/virt-viewer+mingw.yml +++ b/guests/vars/projects/virt-viewer+mingw.yml @@ -1,6 +1,7 @@ --- packages: - glib2 + - icoutils - intltool - mingw32-glib2 - mingw32-glib-networking -- 2.14.3
On Mon, Apr 16, 2018 at 06:47:55PM +0200, Andrea Bolognani wrote:
The package is not needed for native builds, but MinGW builds require it to be installed.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 4 ++++ guests/vars/projects/virt-viewer+mingw.yml | 1 + 2 files changed, 5 insertions(+)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
Both gtk-vnc and gtk-vnc2 exist: the former is based on GTK+ 2 and is considered deprecated, the latter uses GTK+ 3 and it's actively developed. We need the GTK+ 3-based version for our builds: make that more explicit by renaming the mapping. The MinGW variant of the mapping already does this. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 2 +- guests/vars/projects/virt-viewer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 1c1a872..f1777fe 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -164,7 +164,7 @@ mappings: default: gtk-doc deb: gtk-doc-tools - gtk-vnc: + gtk-vnc2: deb: libgtk-vnc-2.0-dev pkg: gtk-vnc rpm: gtk-vnc2-devel diff --git a/guests/vars/projects/virt-viewer.yml b/guests/vars/projects/virt-viewer.yml index 6f3dbf9..cd32176 100644 --- a/guests/vars/projects/virt-viewer.yml +++ b/guests/vars/projects/virt-viewer.yml @@ -1,7 +1,7 @@ --- packages: - glib2 - - gtk-vnc + - gtk-vnc2 - gtk3 - intltool - libgovirt -- 2.14.3
On Mon, Apr 16, 2018 at 06:47:56PM +0200, Andrea Bolognani wrote:
Both gtk-vnc and gtk-vnc2 exist: the former is based on GTK+ 2 and is considered deprecated, the latter uses GTK+ 3 and it's actively developed.
We need the GTK+ 3-based version for our builds: make that more explicit by renaming the mapping. The MinGW variant of the mapping already does this.
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 2 +- guests/vars/projects/virt-viewer.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> 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 :|
participants (2)
-
Andrea Bolognani -
Daniel P. Berrangé