3 files changed, 24 insertions, 27 deletions

diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 95543282..796d6dd8 100644
--- a/recipes-extended/libvirt/libvirt-python.inc
+++ b/recipes-extended/libvirt/libvirt-python.inc
@@ -18,8 +18,8 @@ FILES_${PN}-python = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*"
 SRC_URI += "http://libvirt.org/sources/python/libvirt-python-${PV}.tar.gz;name=libvirt_python"
 SRC_URI += "file://libvirt_api_xml_path.patch;patchdir=../libvirt-python-${PV}"
 
-SRC_URI[libvirt_python.md5sum] = "b7e086e080e5681bece9e87db5a88afa"
-SRC_URI[libvirt_python.sha256sum] = "5213f995cb55a2f770aa36704b60313958c7ff1fde8cca39028ea889cc9f30ff"
+SRC_URI[libvirt_python.md5sum] = "4c8c38c409f967b8b47e0d7c6df050a4"
+SRC_URI[libvirt_python.sha256sum] = "561cafedb83e41880405905f6309f4a86981cfe05edbbc83c839f7c47d8ba603"
 
 export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
 export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
index d49776c1..53e93258 100644
--- a/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
+++ b/recipes-extended/libvirt/libvirt/tools-add-libvirt-net-rpc-to-virt-host-validate-when.patch
@@ -20,24 +20,24 @@ Signed-off-by: Dengke Du <dengke.du@windriver.com>
  tools/Makefile.am    | 12 ++++++++++++
  2 files changed, 31 insertions(+)
 
-diff --git a/examples/Makefile.am b/examples/Makefile.am
-index ee7d3e6..7a5fd73 100644
---- a/examples/Makefile.am
-+++ b/examples/Makefile.am
-@@ -34,6 +34,10 @@ LDADD = $(STATIC_BINARIES) $(WARN_CFLAGS) \
-        $(top_builddir)/src/libvirt.la \
-        $(top_builddir)/src/libvirt-admin.la
+Index: libvirt-5.5.0/examples/Makefile.am
+===================================================================
+--- libvirt-5.5.0.orig/examples/Makefile.am
++++ libvirt-5.5.0/examples/Makefile.am
+@@ -77,6 +77,10 @@
+        $(top_builddir)/src/libvirt-admin.la \
+        $(NULL)
  
 +if WITH_GNUTLS
 +LDADD += $(top_builddir)/src/libvirt-net-rpc.la
 +endif
 +
- noinst_PROGRAMS=dominfo/info1 dommigrate/dommigrate domsuspend/suspend \
-        domtop/domtop hellolibvirt/hellolibvirt object-events/event-test \
-        openauth/openauth rename/rename admin/list_servers admin/list_clients \
-@@ -65,6 +69,21 @@ admin_logging_SOURCES = admin/logging.c
- INSTALL_DATA_LOCAL =
- UNINSTALL_LOCAL =
+ noinst_PROGRAMS = \
+        c/admin/client_close \
+        c/admin/client_info \
+@@ -111,6 +115,21 @@
+ c_misc_hellolibvirt_SOURCES = c/misc/hellolibvirt.c
+ c_misc_openauth_SOURCES = c/misc/openauth.c
  
 +if WITH_GNUTLS
 +dominfo_info1_LDADD = $(top_builddir)/src/libvirt-net-rpc.la  \
@@ -55,13 +55,13 @@ index ee7d3e6..7a5fd73 100644
 +endif
 +
  if WITH_NWFILTER
- NWFILTER_DIR = "$(DESTDIR)$(sysconfdir)/libvirt/nwfilter"
  
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index c6064de..1ac8445 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -188,6 +188,12 @@ virt_host_validate_LDADD = \
+ nwfilterdir = $(sysconfdir)/libvirt/nwfilter
+Index: libvirt-5.5.0/tools/Makefile.am
+===================================================================
+--- libvirt-5.5.0.orig/tools/Makefile.am
++++ libvirt-5.5.0/tools/Makefile.am
+@@ -188,6 +188,12 @@
                 ../gnulib/lib/libgnu.la \
                 $(NULL)
  
@@ -74,7 +74,7 @@ index c6064de..1ac8445 100644
  virt_host_validate_CFLAGS = \
                 $(AM_CFLAGS) \
                 $(NULL)
-@@ -265,6 +271,12 @@ virt_admin_CFLAGS = \
+@@ -265,6 +271,12 @@
                 $(READLINE_CFLAGS)
  BUILT_SOURCES =
  
@@ -87,6 +87,3 @@ index c6064de..1ac8445 100644
  if WITH_WIN_ICON
  virsh_LDADD += virsh_win_icon.$(OBJEXT)
  
--- 
-2.7.4
-
diff --git a/recipes-extended/libvirt/libvirt_5.3.0.bb b/recipes-extended/libvirt/libvirt_5.5.0.bb
index c54a99e2..222654a3 100644
--- a/recipes-extended/libvirt/libvirt_5.3.0.bb
+++ b/recipes-extended/libvirt/libvirt_5.5.0.bb
@@ -38,8 +38,8 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.xz;name=libvirt \
            file://hook_support.py \
           "
 
-SRC_URI[libvirt.md5sum] = "1cfaaf3717783ba19850b5ac04f7e76a"
-SRC_URI[libvirt.sha256sum] = "8564bdd506817b3957fa67e4f06b217922d30f19e416c4dc620995fd155dc101"
+SRC_URI[libvirt.md5sum] = "27c5fb6c8d2d46eb9e8165aeb3b499b0"
+SRC_URI[libvirt.sha256sum] = "2306ef0947a594f91ec9da4b8b0307bdb54b897f17de19f48e8ecdca08ff35e8"
 
 inherit autotools gettext update-rc.d pkgconfig ptest systemd useradd
 USERADD_PACKAGES = "${PN}"