[libvirt] [jenkins-ci PATCH] guests: Add json-glib dependency for osinfo-db-tools

Fabiano Fidêncio posted 1 patch 13 weeks ago
Failed in applying to current master (apply log)
guests/vars/mappings.yml                         | 11 +++++++++++
guests/vars/projects/osinfo-db-tools+mingw32.yml |  1 +
guests/vars/projects/osinfo-db-tools+mingw64.yml |  1 +
guests/vars/projects/osinfo-db-tools.yml         |  1 +
4 files changed, 14 insertions(+)

[libvirt] [jenkins-ci PATCH] guests: Add json-glib dependency for osinfo-db-tools

Posted by Fabiano Fidêncio 13 weeks ago
Since bc594939c[0] osinto-db-tools depends on json-glib.

[0]: https://gitlab.com/libosinfo/osinfo-db-tools/commit/bc594939c827d3364bb919c81f60a687c1ee9a49

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
---
 guests/vars/mappings.yml                         | 11 +++++++++++
 guests/vars/projects/osinfo-db-tools+mingw32.yml |  1 +
 guests/vars/projects/osinfo-db-tools+mingw64.yml |  1 +
 guests/vars/projects/osinfo-db-tools.yml         |  1 +
 4 files changed, 14 insertions(+)

diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml
index 19f7a96..b160c50 100644
--- a/guests/vars/mappings.yml
+++ b/guests/vars/mappings.yml
@@ -198,6 +198,11 @@ mappings:
     rpm: java-1.8.0-openjdk-headless
     Ubuntu:
 
+  json-glib:
+    deb: libjson-glib-dev
+    pkg: json-glib
+    rpm: json-glib-devel
+
   libacl:
     deb: libacl1-dev
     rpm: libacl-devel
@@ -375,6 +380,9 @@ mappings:
   mingw32-gtk-vnc2:
     FedoraRawhide: mingw32-gtk-vnc2
 
+  mingw32-json-glib:
+    FedoraRawhide: mingw32-json-glib
+
   mingw32-libarchive:
     FedoraRawhide: mingw32-libarchive
 
@@ -450,6 +458,9 @@ mappings:
   mingw64-gtk-vnc2:
     FedoraRawhide: mingw64-gtk-vnc2
 
+  mingw64-json-glib:
+    FedoraRawhide: mingw64-json-glib
+
   mingw64-libarchive:
     FedoraRawhide: mingw64-libarchive
 
diff --git a/guests/vars/projects/osinfo-db-tools+mingw32.yml b/guests/vars/projects/osinfo-db-tools+mingw32.yml
index b133331..647bea2 100644
--- a/guests/vars/projects/osinfo-db-tools+mingw32.yml
+++ b/guests/vars/projects/osinfo-db-tools+mingw32.yml
@@ -4,3 +4,4 @@ packages:
   - mingw32-libxml2
   - mingw32-libxslt
   - mingw32-libarchive
+  - mingw32-json-glib
diff --git a/guests/vars/projects/osinfo-db-tools+mingw64.yml b/guests/vars/projects/osinfo-db-tools+mingw64.yml
index 049418c..415644a 100644
--- a/guests/vars/projects/osinfo-db-tools+mingw64.yml
+++ b/guests/vars/projects/osinfo-db-tools+mingw64.yml
@@ -4,3 +4,4 @@ packages:
   - mingw64-libxml2
   - mingw64-libxslt
   - mingw64-libarchive
+  - mingw64-json-glib
diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml
index 54d8006..2c533a3 100644
--- a/guests/vars/projects/osinfo-db-tools.yml
+++ b/guests/vars/projects/osinfo-db-tools.yml
@@ -6,3 +6,4 @@ packages:
   - libarchive
   - libxml2
   - libxslt
+  - json-glib
-- 
2.19.1

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

Re: [libvirt] [jenkins-ci PATCH] guests: Add json-glib dependency for osinfo-db-tools

Posted by Andrea Bolognani 13 weeks ago
On Wed, 2018-12-19 at 14:30 +0100, Fabiano Fidêncio wrote:
[...]
> diff --git a/guests/vars/projects/osinfo-db-tools+mingw32.yml b/guests/vars/projects/osinfo-db-tools+mingw32.yml
> index b133331..647bea2 100644
> --- a/guests/vars/projects/osinfo-db-tools+mingw32.yml
> +++ b/guests/vars/projects/osinfo-db-tools+mingw32.yml
> @@ -4,3 +4,4 @@ packages:
>    - mingw32-libxml2
>    - mingw32-libxslt
>    - mingw32-libarchive
> +  - mingw32-json-glib
> diff --git a/guests/vars/projects/osinfo-db-tools+mingw64.yml b/guests/vars/projects/osinfo-db-tools+mingw64.yml
> index 049418c..415644a 100644
> --- a/guests/vars/projects/osinfo-db-tools+mingw64.yml
> +++ b/guests/vars/projects/osinfo-db-tools+mingw64.yml
> @@ -4,3 +4,4 @@ packages:
>    - mingw64-libxml2
>    - mingw64-libxslt
>    - mingw64-libarchive
> +  - mingw64-json-glib
> diff --git a/guests/vars/projects/osinfo-db-tools.yml b/guests/vars/projects/osinfo-db-tools.yml
> index 54d8006..2c533a3 100644
> --- a/guests/vars/projects/osinfo-db-tools.yml
> +++ b/guests/vars/projects/osinfo-db-tools.yml
> @@ -6,3 +6,4 @@ packages:
>    - libarchive
>    - libxml2
>    - libxslt
> +  - json-glib

The lists above are supposed to be alphabetically sorted, which
after your patch they no longer are. I'll fix that before pushing.

Other than that, the patch looks good and my testing confirms it
works fine, so

  Reviewed-by: Andrea Bolognani <abologna@redhat.com>

I'll push and apply the changes shortly.

-- 
Andrea Bolognani / Red Hat / Virtualization

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