[libvirt] [jenkins-ci PATCH 0/4] Switch back from jansson to yajl
A straighforward revert of e1575b08511f..d2bbe1eee61a. Andrea Bolognani (4): guests: Re-introduce yajl kludge guests: Add yajl mapping guests: Install yajl for libvirt guests: Don't install jansson for libvirt guests/playbooks/update/tasks/kludges.yml | 2 ++ guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) -- 2.17.1
libvirt switched back from jansson to yajl, so we're going to need this in a second. This reverts commit d2bbe1eee61aea55beed7eea5d9ed60f3a08cbb9. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/playbooks/update/tasks/kludges.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guests/playbooks/update/tasks/kludges.yml b/guests/playbooks/update/tasks/kludges.yml index 31e9d6a..0ad61a7 100644 --- a/guests/playbooks/update/tasks/kludges.yml +++ b/guests/playbooks/update/tasks/kludges.yml @@ -9,7 +9,9 @@ force: yes with_items: - include/sasl + - include/yajl - lib/libsasl2.so + - lib/libyajl.so when: - os_name == 'FreeBSD' -- 2.17.1
We're going to use it for libvirt. This reverts commit 0399edd04259f8c49dfd0dbd76740217c90baa1c. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index be356aa..f6b762d 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -800,6 +800,11 @@ mappings: deb: liblzma-dev Fedora: xz-static + yajl: + deb: libyajl-dev + pkg: yajl + rpm: yajl-devel + zfs: default: zfs-fuse CentOS: -- 2.17.1
It's once again a build dependency. This reverts commit 34e7fe227418db1d06ce2cd50b042ee3d1a03f29. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/projects/libvirt.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/guests/vars/projects/libvirt.yml b/guests/vars/projects/libvirt.yml index e512a50..8c90a85 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -55,4 +55,5 @@ packages: - xen - xmllint - xsltproc + - yajl - zfs -- 2.17.1
It's no longer needed, and neither is the mapping. This reverts commit e1575b08511f09e9c7759f02fadd14752fb2f4f1. Signed-off-by: Andrea Bolognani <abologna@redhat.com> --- guests/vars/mappings.yml | 5 ----- guests/vars/projects/libvirt.yml | 1 - 2 files changed, 6 deletions(-) diff --git a/guests/vars/mappings.yml b/guests/vars/mappings.yml index f6b762d..454afe5 100644 --- a/guests/vars/mappings.yml +++ b/guests/vars/mappings.yml @@ -185,11 +185,6 @@ 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 8c90a85..3274564 100644 --- a/guests/vars/projects/libvirt.yml +++ b/guests/vars/projects/libvirt.yml @@ -15,7 +15,6 @@ packages: - hal - ip - iscsiadm - - jansson - libacl - libattr - libaudit -- 2.17.1
On Tue, Aug 14, 2018 at 01:07:54PM +0200, Andrea Bolognani wrote:
A straighforward revert of e1575b08511f..d2bbe1eee61a.
Andrea Bolognani (4): guests: Re-introduce yajl kludge guests: Add yajl mapping guests: Install yajl for libvirt guests: Don't install jansson for libvirt
guests/playbooks/update/tasks/kludges.yml | 2 ++ guests/vars/mappings.yml | 10 +++++----- guests/vars/projects/libvirt.yml | 2 +- 3 files changed, 8 insertions(+), 6 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é