From patchwork Thu May 17 16:51:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [CONSOLIDATED, PULL, 12/12] xserver-xorg-lite: disable xmlto like full xserver-xorg does Date: Thu, 17 May 2012 16:51:14 -0000 From: Saul Wold X-Patchwork-Id: 27921 Message-Id: <25d9e571490c77ca67d4f7224e37ba0349deb0c1.1337273095.git.sgw@linux.intel.com> To: openembedded-core@lists.openembedded.org From: Martin Jansa * 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 “ | ^ | /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 “Software” | ^ | /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 “ | ^ | /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 “Software” | ^ | 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" | %defs; | ^ | Entity: line 1: | %defs; | ^ Signed-off-by: Martin Jansa --- .../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- .../xorg-xserver/xserver-xorg-lite.inc | 1 + 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 6a86af4..fc41568 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 57615f5..02db5bf 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 \ "