summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-07-15 20:18:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 10:20:50 +0100
commitc95dec0b9388ddc2efe4fd059e0afbf871477eb9 (patch)
treec119a62167e4a61bd196604dc1d026e1b3e079cd
parent605e1f38f4a4257987e03e35518ed720fed56bc2 (diff)
downloadpoky-c95dec0b9388ddc2efe4fd059e0afbf871477eb9.tar.gz
xmlto: add version 0.0.25
It moved from meta-oe and fixed the defect that xmlto/xsltproc stylesheets cannot be found even when they are installed in sysroot. About the config files (catalog.xml), we refered what Ubuntu 13.04 did, so it could correctly search the xsl stylesheets and xml dtds. Assigned the environment variable XML_CATALOG_FILES, so the xmlto will use oe-core's config as priority to avoid the the search from build system. [YOCTO #2416] (From OE-Core rev: 6eccf7940e90dd06568f7a2da36ce2d5d090aed5) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Saul Wold <sgw@linux.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.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch30
-rw-r--r--meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch12
-rw-r--r--meta/recipes-devtools/xmlto/xmlto_0.0.25.bb37
4 files changed, 98 insertions, 0 deletions
diff --git a/meta/recipes-devtools/xmlto/files/catalog.xml b/meta/recipes-devtools/xmlto/files/catalog.xml
new file mode 100644
index 0000000000..6b8833d871
--- /dev/null
+++ b/meta/recipes-devtools/xmlto/files/catalog.xml
@@ -0,0 +1,19 @@
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.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
new file mode 100644
index 0000000000..69ca43221c
--- /dev/null
+++ b/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
@@ -0,0 +1,30 @@
1configure.in: drop the test of xmllint and xsltproc
2
3The test is unnecessary, the xmllint and xsltproc were explicitly
4added to RDEPENDS.
5
6Upstream-Status: oe-specific
7Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
8---
9 configure.in | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-)
11
12diff --git a/configure.in b/configure.in
13--- a/configure.in
14+++ b/configure.in
15@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.])
16 AC_PATH_PROG([LOCALE], [locale], [locale])
17
18 AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.])
19-AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
20+dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint])
21
22 AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.])
23-AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
24+dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc])
25
26 dnl
27 dnl toolchains
28--
291.8.1.2
30
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
new file mode 100644
index 0000000000..faa8acce89
--- /dev/null
+++ b/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
@@ -0,0 +1,12 @@
1diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
2--- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200
3+++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200
4@@ -1,7 +1,7 @@
5 AC_INIT(xmlto, 0.0.25)
6 AC_CONFIG_SRCDIR(xmlto.spec.in)
7 AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
8-AM_CONFIG_HEADER(config.h)
9+AC_CONFIG_HEADERS(config.h)
10
11 AC_PROG_CC
12 AM_PROG_CC_C_O
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb
new file mode 100644
index 0000000000..2747d6d2d6
--- /dev/null
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb
@@ -0,0 +1,37 @@
1SUMMARY = "A shell-script tool for converting XML files to various formats"
2HOMEPAGE = "https://fedorahosted.org/xmlto/"
3SECTION = "docs/xmlto"
4LICENSE = "GPLv2"
5
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7
8SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
9 file://obsolete_automake_macros.patch \
10 file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
11 file://catalog.xml \
12"
13SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
14SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"
15
16inherit autotools
17
18# xmlto needs getopt/xmllint/xsltproc at runtime
19RDEPENDS_${PN} = "docbook-xml-dtd4 \
20 docbook-xsl-stylesheets \
21 util-linux \
22 libxml2 \
23"
24RDEPENDS_${PN}_append_class-target = " \
25 libxslt-bin \
26"
27
28BBCLASSEXTEND = "native"
29
30EXTRA_OECONF_append = " XMLLINT=xmllint XSLTPROC=xsltproc"
31
32do_install_append() {
33 install -d ${D}${sysconfdir}/xml/
34 install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml
35 create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml
36}
37