guests: Various fixes and improvements

[libvirt] [jenkins-ci PATCH 4/8] guests: libosinfo needs libcurl and wget

Posted by Andrea Bolognani 6 years, 12 months ago

libcurl is used directly, and wget is used to retrieve PCI
and USB IDs at build time on platforms that don't ship them
as part of the operating system, such as MinGW.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
---
 guests/vars/projects/libosinfo+mingw.yml | 3 +++
 guests/vars/projects/libosinfo.yml       | 1 +
 2 files changed, 4 insertions(+)

diff --git a/guests/vars/projects/libosinfo+mingw.yml b/guests/vars/projects/libosinfo+mingw.yml
index e3fc3cb..0eb27af 100644
--- a/guests/vars/projects/libosinfo+mingw.yml
+++ b/guests/vars/projects/libosinfo+mingw.yml
@@ -1,8 +1,11 @@
 ---
 packages:
+  - mingw32-curl
   - mingw32-glib2
   - mingw32-libxml2
   - mingw32-libxslt
+  - mingw64-curl
   - mingw64-glib2
   - mingw64-libxml2
   - mingw64-libxslt
+  - wget
diff --git a/guests/vars/projects/libosinfo.yml b/guests/vars/projects/libosinfo.yml
index 1ecf483..4297110 100644
--- a/guests/vars/projects/libosinfo.yml
+++ b/guests/vars/projects/libosinfo.yml
@@ -6,6 +6,7 @@ packages:
   - gobject-introspection
   - gtk-doc
   - intltool
+  - libcurl
   - libsoup
   - libxml2
   - libxslt
-- 
2.17.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [jenkins-ci PATCH 4/8] guests: libosinfo needs libcurl and wget

Posted by Pavel Hrdina 6 years, 12 months ago

On Tue, May 15, 2018 at 04:40:05PM +0200, Andrea Bolognani wrote:
> libcurl is used directly, and wget is used to retrieve PCI
> and USB IDs at build time on platforms that don't ship them
> as part of the operating system, such as MinGW.
> 
> Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> ---
>  guests/vars/projects/libosinfo+mingw.yml | 3 +++
>  guests/vars/projects/libosinfo.yml       | 1 +
>  2 files changed, 4 insertions(+)

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>

Note: minimal installation of CentOS doesn't ship wget by default so I
guess we might need to extend the list of dependencies.  Currently it
works on CentOS 7 because we are building libvirt-cim which has wget as
explicit dependency.
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

Re: [libvirt] [jenkins-ci PATCH 4/8] guests: libosinfo needs libcurl and wget

Posted by Andrea Bolognani 6 years, 12 months ago

On Wed, 2018-05-16 at 10:44 +0200, Pavel Hrdina wrote:
> On Tue, May 15, 2018 at 04:40:05PM +0200, Andrea Bolognani wrote:
> > libcurl is used directly, and wget is used to retrieve PCI
> > and USB IDs at build time on platforms that don't ship them
> > as part of the operating system, such as MinGW.
> > 
> > Signed-off-by: Andrea Bolognani <abologna@redhat.com>
> > ---
> >  guests/vars/projects/libosinfo+mingw.yml | 3 +++
> >  guests/vars/projects/libosinfo.yml       | 1 +
> >  2 files changed, 4 insertions(+)
> 
> Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
> 
> Note: minimal installation of CentOS doesn't ship wget by default so I
> guess we might need to extend the list of dependencies.  Currently it
> works on CentOS 7 because we are building libvirt-cim which has wget as
> explicit dependency.

wget is only needed for MinGW builds, the native one uses the
contents of the pci-ids and usb-ids packages, which are
explicitly installed on CentOS as well as other native platforms.
So this is the only change that's needed.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list