summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-05-12 14:18:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-17 21:11:26 +0100
commite8c61491cdd28caa51b567c6ce40155504f9eadb (patch)
treee11f792f98dba7cde70404346778fd60efd86b46
parent0c0c4efbf92bcf0f8942f17c18525a4b4ed1798c (diff)
downloadopenembedded-core-e8c61491cdd28caa51b567c6ce40155504f9eadb.tar.gz
openembedded-core-e8c61491cdd28caa51b567c6ce40155504f9eadb.tar.bz2
openembedded-core-e8c61491cdd28caa51b567c6ce40155504f9eadb.tar.xz
openembedded-core-e8c61491cdd28caa51b567c6ce40155504f9eadb.zip
xserver-xorg-lite: disable xmlto like full xserver-xorg does
* xmlto-native is unusable (see YOCTO #2416 xmlto/xsltproc stylesheets cannot be found even when they are installed in sysroot) * fails like this: | make[2]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc' | /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto xhtml-nochunks Xserver-spec.xml | /OE/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/xmlto xhtml-nochunks Xinput.xml | xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate (status 3) | xmlto: Fix document syntax or use --skip-validation option | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:3: warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" | "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"> | ^ | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'ldquo' not defined | btaining a copy of this software and associated documentation files (the &ldquo; | ^ | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:40: parser error : Entity 'rdquo' not defined | of this software and associated documentation files (the &ldquo;Software&rdquo; | ^ | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'ldquo' not defined | btaining a copy of this software and associated documentation files (the &ldquo; | ^ | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml:42: parser error : Entity 'rdquo' not defined | of this software and associated documentation files (the &ldquo;Software&rdquo; | ^ | warning: failed to load external entity "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" | validity error : Could not load the external subset "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" | Document /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xinput.xml does not validate | xmlto: /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml does not validate (status 3) | xmlto: Fix document syntax or use --skip-validation option | make[2]: *** [Xinput.html] Error 13 | make[2]: *** Waiting for unfinished jobs.... | /OE/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/xserver-xorg-lite/xserver-xorg-lite-2_1.11.2-r2/xorg-server-1.11.2/doc/Xserver-spec.xml:4: warning: failed to load external entity "/xserver/doc/xml/xserver.ent" | <!ENTITY % defs SYSTEM "/xserver/doc/xml/xserver.ent"> %defs; | ^ | Entity: line 1: | %defs; | ^ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc1
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index 6a86af400..fc41568a5 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -7,5 +7,5 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r2"
+PR = "r3"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
index 57615f529..02db5bf5a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc
@@ -4,4 +4,5 @@ EXTRA_OECONF += "\
--disable-dri \
--disable-glx \
--disable-dga \
+ --without-xmlto \
"