From e8c61491cdd28caa51b567c6ce40155504f9eadb Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sat, 12 May 2012 14:18:33 +0200 Subject: 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 “ | ^ | /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 --- meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 2 +- meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 \ " -- cgit v1.2.3 ref='#n40'>40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199