From 6eccf7940e90dd06568f7a2da36ce2d5d090aed5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Tue, 15 Jul 2014 20:18:06 +0800 Subject: 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] Signed-off-by: Hongxu Jia Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/xmlto/files/catalog.xml | 19 +++++++++++ ....in-drop-the-test-of-xmllint-and-xsltproc.patch | 30 ++++++++++++++++++ .../xmlto-0.0.25/obsolete_automake_macros.patch | 12 +++++++ meta/recipes-devtools/xmlto/xmlto_0.0.25.bb | 37 ++++++++++++++++++++++ 4 files changed, 98 insertions(+) create mode 100644 meta/recipes-devtools/xmlto/files/catalog.xml create mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch create mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch create mode 100644 meta/recipes-devtools/xmlto/xmlto_0.0.25.bb 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 @@ + + + + + + + + + + + + + + + + + + + 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 @@ +configure.in: drop the test of xmllint and xsltproc + +The test is unnecessary, the xmllint and xsltproc were explicitly +added to RDEPENDS. + +Upstream-Status: oe-specific +Signed-off-by: Hongxu Jia +--- + configure.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -42,10 +42,10 @@ AC_ARG_VAR([LOCALE], [Name and path of the `locale' program.]) + AC_PATH_PROG([LOCALE], [locale], [locale]) + + AC_ARG_VAR([XMLLINT], [Name and path of the `xmllint' program.]) +-AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) ++dnl AC_PATH_PROG([XMLLINT], [xmllint], [xmllint]) + + AC_ARG_VAR([XSLTPROC], [Name and path of the `xsltproc' program.]) +-AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) ++dnl AC_PATH_PROG([XSLTPROC], [xsltproc], [xsltproc]) + + dnl + dnl toolchains +-- +1.8.1.2 + 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 @@ +diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in +--- xmlto-0.0.25/configure.in 2011-12-01 17:49:00.000000000 +0200 ++++ xmlto-0.0.25/configure.in 2013-01-07 05:24:16.169953519 +0200 +@@ -1,7 +1,7 @@ + AC_INIT(xmlto, 0.0.25) + AC_CONFIG_SRCDIR(xmlto.spec.in) + AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6]) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_PROG_CC + 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 @@ +SUMMARY = "A shell-script tool for converting XML files to various formats" +HOMEPAGE = "https://fedorahosted.org/xmlto/" +SECTION = "docs/xmlto" +LICENSE = "GPLv2" + +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \ + file://obsolete_automake_macros.patch \ + file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \ + file://catalog.xml \ +" +SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d" +SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a" + +inherit autotools + +# xmlto needs getopt/xmllint/xsltproc at runtime +RDEPENDS_${PN} = "docbook-xml-dtd4 \ + docbook-xsl-stylesheets \ + util-linux \ + libxml2 \ +" +RDEPENDS_${PN}_append_class-target = " \ + libxslt-bin \ +" + +BBCLASSEXTEND = "native" + +EXTRA_OECONF_append = " XMLLINT=xmllint XSLTPROC=xsltproc" + +do_install_append() { + install -d ${D}${sysconfdir}/xml/ + install -m 755 ${WORKDIR}/catalog.xml ${D}${sysconfdir}/xml/catalog.xml + create_wrapper ${D}/${bindir}/xmlto XML_CATALOG_FILES=${sysconfdir}/xml/catalog.xml +} + -- cgit 1.2.3-korg