summaryrefslogtreecommitdiffstats
path: root/external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch')
-rw-r--r--external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch22
1 files changed, 10 insertions, 12 deletions
diff --git a/external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch b/external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
index c920139e..33231960 100644
--- a/external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
+++ b/external/meta-virtualization/recipes-extended/libvirt/libvirt/0001-to-fix-build-error.patch
@@ -1,4 +1,4 @@
-From 8353dc1e642011199c3b3ba057d51d8768e4cd54 Mon Sep 17 00:00:00 2001
+From 7cf1d66c4b01c40b45b8a38370c7ffee46dfb10a 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
@@ -17,26 +17,27 @@ Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
[MA: rebase to v4.3.0]
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
+
---
docs/Makefile.am | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 9620587..060a82b 100644
+index 61862c4..c259535 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
-@@ -183,7 +183,7 @@ EXTRA_DIST= \
- hvsupport.pl \
+@@ -360,7 +360,7 @@ EXTRA_DIST= \
+ aclperms.htmlinc \
$(schema_DATA)
-acl_generated = aclperms.htmlinc
+acl.html:: $(srcdir)/aclperms.htmlinc
- $(srcdir)/aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
- $(srcdir)/genaclperms.pl Makefile.am
-@@ -247,8 +247,7 @@ MAINTAINERCLEANFILES += \
- %.png: %.fig
- convert -rotate 90 $< $@
+ aclperms.htmlinc: $(top_srcdir)/src/access/viraccessperm.h \
+ $(top_srcdir)/scripts/genaclperms.py Makefile.am
+@@ -426,8 +426,7 @@ manpages/%.html.in: manpages/%.rst
+ $(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
+ $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-%.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
- $(acl_generated)
@@ -44,6 +45,3 @@ index 9620587..060a82b 100644
$(AM_V_GEN)name=`echo $@ | sed -e 's/.tmp//'`; \
dir=`dirname $@` ; \
if test "$$dir" = "."; \
---
-1.9.1
-