libvirt: upgrade 1.2.15 -> 1.2.17

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

3 files changed, 49 insertions, 4 deletions

diff --git a/recipes-extended/libvirt/libvirt-1.2.17/0001-to-fix-build-error.patch b/recipes-extended/libvirt/libvirt-1.2.17/0001-to-fix-build-error.patch
new file mode 100644
index 00000000..61a54e18
--- /dev/null
+++ b/recipes-extended/libvirt/libvirt-1.2.17/0001-to-fix-build-error.patch
@@ -0,0 +1,44 @@
+From 62514c8c2925e48a4f20ce3d7d48387851cb76a5 Mon Sep 17 00:00:00 2001
+From: Lei Maohui <leimaohui@cn.fujitsu.com>
+Date: Fri, 31 Jul 2015 03:17:07 +0900
+Subject: [PATCH] to fix build error
+
+The error likes as following
+
+| Generating internals/command.html.tmp
+| /bin/sh: line 3: internals/command.html.tmp: No such file or directory
+| rm: Generating internals/locking.html.tmp
+| cannot remove `internals/command.html.tmp': No such file or directory
+| make[3]: *** [internals/command.html.tmp] Error 1
+| make[3]: *** Waiting for unfinished jobs....
+
+Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
+---
+ docs/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/Makefile.am b/docs/Makefile.am
+index daf37b6..125c5fd 100644
+--- a/docs/Makefile.am
++++ b/docs/Makefile.am
+@@ -162,7 +162,7 @@ EXTRA_DIST=                                 \
+   sitemap.html.in aclperms.htmlinc \
+   todo.pl hvsupport.pl todo.cfg-example
+ 
+-acl_generated = aclperms.htmlinc
++acl.html:: $(srcdir)/aclperms.htmlinc
+ 
+ $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
+         $(srcdir)/genaclperms.pl Makefile.am
+@@ -227,7 +227,7 @@ internals/%.html.tmp: internals/%.html.in subsite.xsl page.xsl sitemap.html.in
+            $(top_srcdir)/docs/subsite.xsl $< > $@ \
+            || { rm $@ && exit 1; }; fi
+ 
+-%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in $(acl_generated)
++%.html.tmp: %.html.in site.xsl page.xsl sitemap.html.in 
+        @if [ -x $(XSLTPROC) ] ; then \
+          echo "Generating $@"; \
+          name=`echo $@ | sed -e 's/.tmp//'`; \
+-- 
+1.8.4.2
+
diff --git a/recipes-extended/libvirt/libvirt-python.inc b/recipes-extended/libvirt/libvirt-python.inc
index 550236ac..f42e4913 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] = "f13b566b54fe71ec0f26992aee11dd09"
-SRC_URI[libvirt_python.sha256sum] = "9a6dfbd487d49f887a41aca4bfb1b4e043fd9fbdfc041252cae84023f5c387ba"
+SRC_URI[libvirt_python.md5sum] = "a695e323e33db562d86e947f7ac77f09"
+SRC_URI[libvirt_python.sha256sum] = "f4d3db4012a800a2519e62bbef4ce14a37e030a20ab18f5b66759533a39b36ed"
 
 export LIBVIRT_API_PATH = "${S}/docs/libvirt-api.xml"
 export LIBVIRT_CFLAGS = "-I${S}/include"
diff --git a/recipes-extended/libvirt/libvirt_1.2.15.bb b/recipes-extended/libvirt/libvirt_1.2.17.bb
index 8abd41ef..9f8c3af2 100644
--- a/recipes-extended/libvirt/libvirt_1.2.15.bb
+++ b/recipes-extended/libvirt/libvirt_1.2.17.bb
@@ -31,10 +31,11 @@ SRC_URI = "http://libvirt.org/sources/libvirt-${PV}.tar.gz;name=libvirt \
            file://run-ptest \
            file://tests-allow-separated-src-and-build-dirs.patch \
            file://libvirt-use-pkg-config-to-locate-libcap.patch \
+           file://0001-to-fix-build-error.patch \
           "
 
-SRC_URI[libvirt.md5sum] = "08c2ea825d076ee67b1bbc600c220b97"
-SRC_URI[libvirt.sha256sum] = "5f88041b8c212f8f687c672fe583108833240d6175b512ce4de92ab6660194c6"
+SRC_URI[libvirt.md5sum] = "a1f49050223be3cbd7678c32b1ee2756"
+SRC_URI[libvirt.sha256sum] = "e07eaf20b0590fae05ba3b53ad4dac3e5fbd771437563cc78b692f23ddd02fad"
 
 inherit autotools gettext update-rc.d pkgconfig ptest