summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-04-04 23:16:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-05 17:32:50 +0100
commit6422a7f8ed8e925d492a249cb93636220165cf77 (patch)
tree653502cbc9f81c0493d1432012631aa992da16b1
parenta4ac9ce7de6b3f8409c48ef5767ea03ac30b398a (diff)
downloadpoky-6422a7f8ed8e925d492a249cb93636220165cf77.tar.gz
xmlto: remove XML catalog
Now that docbook-xml and docbook-xsl use the xmlcatalog class, xmlto can stop shipping a hand-coded catalogue. It still needs to keep the wrapper so that the sysroot catalog is used instead of /etc/xml/catalog. The wrapper is native-specific so mark it as such. Note that this does effectively break xmlto on the target as the xmlcatalog class doesn't write a catalog for the target yet, but I'm hoping that nobody actually uses it on target. (From OE-Core rev: b12686ecdd0b0bdb36c8d1a2baeeb66aadff1b8c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/xmlto/files/catalog.xml19
-rw-r--r--meta/recipes-devtools/xmlto/xmlto_0.0.28.bb7
2 files changed, 2 insertions, 24 deletions
diff --git a/meta/recipes-devtools/xmlto/files/catalog.xml b/meta/recipes-devtools/xmlto/files/catalog.xml
deleted file mode 100644
index 6b8833d871..0000000000
--- a/meta/recipes-devtools/xmlto/files/catalog.xml
+++ /dev/null
@@ -1,19 +0,0 @@
1<?xml version="1.0"?>
2<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
3<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
4<delegateSystem systemIdStartString="http://docbook.org/xml/" catalog="./docbook-xml.xml"/>
5<delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook" catalog="./docbook-xml.xml"/>
6<delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML" catalog="./docbook-xml.xml"/>
7<delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315" catalog="./docbook-xml.xml"/>
8<delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML" catalog="./docbook-xml.xml"/>
9<delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBk XML" catalog="./docbook-xml.xml"/>
10<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML" catalog="./docbook-xml.xml"/>
11<delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook" catalog="./docbook-xml.xml"/>
12<delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBk XML" catalog="./docbook-xml.xml"/>
13<delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML" catalog="./docbook-xml.xml"/>
14<delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430" catalog="./docbook-xml.xml"/>
15<delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/" catalog="./docbook-xml.xml"/>
16<delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model" catalog="./docbook-xml.xml"/>
17<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="./docbook-xsl.xml"/>
18<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="./docbook-xsl.xml"/>
19</catalog>
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
index 6216d7782b..06dc002083 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.28.bb
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7 7
8SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \ 8SRC_URI = "https://releases.pagure.org/xmlto/xmlto-${PV}.tar.gz \
9 file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ 9 file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
10 file://catalog.xml \
11" 10"
12SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6" 11SRC_URI[md5sum] = "a1fefad9d83499a15576768f60f847c6"
13SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3" 12SRC_URI[sha256sum] = "2f986b7c9a0e9ac6728147668e776d405465284e13c74d4146c9cbc51fd8aad3"
@@ -32,10 +31,8 @@ BBCLASSEXTEND = "native"
32 31
33EXTRA_OECONF_append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc" 32EXTRA_OECONF_append = " BASH=/bin/bash GCP=/bin/cp XMLLINT=xmllint XSLTPROC=xsltproc"
34 33
35do_install_append() { 34do_install_append_class-native() {
36 install -d ${D}${sysconfdir}/xml/ 35 create_wrapper ${D}${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog
37 install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml
38 create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml
39} 36}
40 37
41do_populate_sysroot[rdeptask] = "do_populate_sysroot" 38do_populate_sysroot[rdeptask] = "do_populate_sysroot"