[libvirt] [jenkins-ci PATCH 0/4] guests: Replace yajl with jansson
Andrea Bolognani (4): guests: Install jansson for libvirt guests: Don't install yajl for libvirt guests: Remove yajl mapping guests: Remove yajl kludge guests/tasks/kludges.yml | 2 -- guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) -- 2.17.1
libvirt has switched from yajl to jansson as its JSON implementation, so we need to have the latter available when building or the QEMU driver will be disabled. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 +++++ guests/vars/projects/libvirt.yml | 1 + 2 files changed, 6 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index 92822cb..eb31131 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -185,6 +185,11 @@ mappings: deb: open-iscsi rpm: iscsi-initiator-utils + jansson: + deb: libjansson-dev + rpm: jansson-devel + pkg: jansson + java: deb: openjdk-8-jre-headless pkg: openjdk8-jre diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 3274564..8c90a85 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -15,6 +15,7 @@ packages: - hal - ip - iscsiadm + - jansson - libacl - libattr - libaudit -- 2.17.1
Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/projects/libvirt.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index 8c90a85..e512a50 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -55,5 +55,4 @@ packages: - xen - xmllint - xsltproc - - yajl - zfs -- 2.17.1
There are no users left. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index eb31131..f6b308a 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -800,11 +800,6 @@ mappings: deb: liblzma-dev Fedora: xz-static - yajl: - deb: libyajl-dev - pkg: yajl - rpm: yajl-devel - zfs: default: zfs-fuse CentOS: -- 2.17.1
No longer necessary now that yajl itself is not being installed. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/tasks/kludges.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/guests/tasks/kludges.yml b/guests/tasks/kludges.yml index 0ad61a7..31e9d6a 100644 --- a/guests/tasks/kludges.yml +++ b/guests/tasks/kludges.yml @@ -9,9 +9,7 @@ force: yes with_items: - include/sasl - - include/yajl - lib/libsasl2.so - - lib/libyajl.so when: - os_name == 'FreeBSD' -- 2.17.1
On Thu, Jul 19, 2018 at 11:49:51AM +0200, Andrea Bolognani wrote:
Andrea Bolognani (4): guests: Install jansson for libvirt guests: Don't install yajl for libvirt guests: Remove yajl mapping guests: Remove yajl kludge
guests/tasks/kludges.yml | 2 -- guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-)
Reviewed-by: Erik Skultety <eskultet@redhat.com>
participants (2)
-
Andrea Bolognani -
Erik Skultety