diff options
Diffstat (limited to 'meta/recipes-devtools/docbook-xml')
5 files changed, 64 insertions, 215 deletions
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch index 59703609ca..1f3364900c 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml-update-catalog.xml.patch @@ -1,97 +1,12 @@ +21/3/2023: modified to remove 4.0 + docbook-xml: update catalog.xml Refer Ubuntu 13.04 to update catalog.xml -Upstream-Status: Pending +Upstream-Status: Inappropriate [docbook 4.x development has ceased, docbook 5 is entirely different] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - docbook-4.0/catalog.xml | 72 +++++++++++++++++++++++++++++++++++++++++++++++ - docbook-4.1.2/catalog.xml | 66 +++++++++++++++++++++++++++++++++++++++++++ - docbook-4.2/catalog.xml | 69 ++++++--------------------------------------- - docbook-4.3/catalog.xml | 72 ++++++++--------------------------------------- - docbook-4.4/catalog.xml | 63 ++--------------------------------------- - docbook-4.5/catalog.xml | 63 ++--------------------------------------- - 6 files changed, 165 insertions(+), 240 deletions(-) - create mode 100644 docbook-4.0/catalog.xml - create mode 100644 docbook-4.1.2/catalog.xml -diff --git a/docbook-4.0/catalog.xml b/docbook-4.0/catalog.xml -new file mode 100644 ---- /dev/null -+++ b/docbook-4.0/catalog.xml -@@ -0,0 +1,72 @@ -+<?xml version='1.0'?> -+<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" -+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> -+ -+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -+ -+<!-- ...................................................................... --> -+<!-- XML Catalog data for DocBook XML V4.0............................... --> -+<!-- File catalog.xml ..................................................... --> -+ -+<!-- Please direct all questions, bug reports, or suggestions for -+ changes to the docbook@lists.oasis-open.org mailing list. For more -+ information, see http://www.oasis-open.org/. -+ --> -+ -+<!-- This is the catalog data file for DocBook V4.0. It is provided as -+ a convenience in building your own catalog files. You need not use -+ the filenames listed here, and need not use the filename method of -+ identifying storage objects at all. See the documentation for -+ detailed information on the files associated with the DocBook DTD. -+ See XML Catalogs at http://www.oasis-open.org/committees/entity/ for -+ detailed information on supplying and using catalog data. -+ --> -+ -+<!-- ...................................................................... --> -+<!-- DocBook driver file .................................................. --> -+ -+<public publicId="-//Norman Walsh//DTD DocBk XML V4.0//EN" -+ uri="docbookx.dtd"/> -+ -+<!-- Other ways to refer to DocBook XML v4.0............................... --> -+<public publicId="-//Norman Walsh//DTD DocBook XML V4.0//EN" -+ uri="docbookx.dtd"/> -+ -+<system systemId="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" -+ uri="docbookx.dtd"/> -+ -+<!-- ...................................................................... --> -+<!-- DocBook modules ...................................................... --> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" -+ uri="dbnotnx.mod"/> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" -+ uri="dbcentx.mod"/> -+ -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" -+ uri="dbpoolx.mod"/> -+ -+<public publicId="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" -+ uri="dbhierx.mod"/> -+ -+<public publicId="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" -+ uri="dbgenent.mod"/> -+ -+<public publicId="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" -+ uri="calstblx.dtd"/> -+ -+<!-- UNOFFICIAL conversion of the exchange table model to XML, based on the OASIS Exchange --> -+<!-- Table Model PUBLIC "-//SGML Open//DTD Exchange Table Model 19960430//EN" --> -+<public publicId="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" -+ uri="soextblx.dtd"/> -+ -+<!-- the following FPI is declared for the DTD inside the DTD, but we'll --> -+<!-- use the version from the latest DocBook -+<public publicId="-//OASIS//DTD XML Exchange Table Model 19990315//EN" -+ uri="soextblx.dtd"/> --> -+ -+<!-- End of catalog data for DocBook XML V4.0 ............................. --> -+<!-- ...................................................................... --> -+ -+</catalog> diff --git a/docbook-4.1.2/catalog.xml b/docbook-4.1.2/catalog.xml new file mode 100644 --- /dev/null diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml deleted file mode 100644 index b71f559ef5..0000000000 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4/docbook-xml.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> -<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Information Pool V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Notations V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//DTD CALS Table Model XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Character Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//ELEMENTS DocBook XML Document Hierarchy V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//Normal Walsh//Exchange Table Model 19960430 XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBk XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML Information Pool V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//DTD DocBook XML V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.5/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Notations V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//Norman Walsh//ENTITIES DocBook XML Additional General Entities V4.0//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.0/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.0/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.2/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD XML Exchange Table Model 19990315//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.4//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.4/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Additional General Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML V4.3//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegateSystem systemIdStartString="http://docbook.org/xml/4.3/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/4.3/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Information Pool V4.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook CALS Table Model V4.5//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.5/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//DTD DocBook XML//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ELEMENTS DocBook Document Hierarchy V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegatePublic publicIdStartString="-//OASIS//ENTITIES DocBook Character Entities V4.1.2//EN" catalog="file:///usr/share/xml/docbook/schema/dtd/4.1.2/catalog.xml"/> - <delegateSystem systemIdStartString="http://www.oasis-open.org/docbook/xml/4.1/docbookx.dtd" catalog="file:///usr/share/xml/docbook/schema/dtd/catalog.xml"/> -</catalog> diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index da62b77a60..5229a0366c 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb @@ -1,31 +1,48 @@ SUMMARY = "Document type definitions for verification of XML data files" DESCRIPTION = "Document type definitions for verification of XML data \ -files against the DocBook rule set, it ships with the latest DocBook 4.5 \ -XML DTD, as well as a selected set of legacy DTDs for use with older \ -documents, including 4.0, 4.1.2, 4.2, 4.3 and 4.4" -HOMEPAGE = "http://www.docbook.org/xml/" +files against the DocBook rule set." +HOMEPAGE = "https://docbook.org" -LICENSE = "OASIS" -LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" - -# Note: the upstream sources are not distributed with a license file. +# The upstream sources are not distributed with a license file. # LICENSE-OASIS is included as a "patch" to workaround this. When # upgrading this recipe, please verify whether this is still needed. -SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/d/docbook-xml/docbook-xml_${PV}.orig.tar.gz \ - file://LICENSE-OASIS \ - file://docbook-xml-update-catalog.xml.patch \ - file://docbook-xml.xml \ -" -SRC_URI[md5sum] = "487b4d44e15cffb1f4048af23f98208e" -SRC_URI[sha256sum] = "b0f8edcf697f5318e63dd98c9a931f3fee167af0805ba441db372e0f17b2a44f" +LICENSE = "OASIS" +LIC_FILES_CHKSUM = "file://${S}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" -UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/docbook-xml/" +# To support apps with xml schema backward compatibility, we must +# install a set of schemas. Install the latest based on PV and then +# name any specific versions as required. TODO: Figure out a mechanism +# to filter exactly which versions are necessary, if that's even +# possible. +# +# DocBook.org lists available release packages at https://docbook.org/xml/. +# +# The release packages relate docbook source at +# https://github.com/docbook/docbook but building them requires the +# Gradle build system. In future, it might be safer to use the source +# tree which would also enable proper SBOM generation through the +# bitbake build system. +# -S="${WORKDIR}/docbook-xml-4.5.c31424" +SRC_URI = "https://docbook.org/xml/4.1.2/docbkx412.zip;name=payload412;subdir=docbook-4.1.2 \ + https://docbook.org/xml/4.2/docbook-xml-4.2.zip;name=payload42;subdir=docbook-4.2 \ + https://docbook.org/xml/4.3/docbook-xml-4.3.zip;name=payload43;subdir=docbook-4.3 \ + https://docbook.org/xml/4.4/docbook-xml-4.4.zip;name=payload44;subdir=docbook-4.4 \ + https://docbook.org/xml/${PV}/docbook-xml-${PV}.zip;name=payloadPV;subdir=docbook-${PV} \ + file://docbook-xml-update-catalog.xml.patch \ + file://LICENSE-OASIS" -inherit allarch -BBCLASSEXTEND = "native" +SRC_URI[payload412.sha256sum] = "30f0644064e0ea71751438251940b1431f46acada814a062870f486c772e7772" +SRC_URI[payload42.sha256sum] = "acc4601e4f97a196076b7e64b368d9248b07c7abf26b34a02cca40eeebe60fa2" +SRC_URI[payload43.sha256sum] = "23068a94ea6fd484b004c5a73ec36a66aa47ea8f0d6b62cc1695931f5c143464" +SRC_URI[payload44.sha256sum] = "02f159eb88c4254d95e831c51c144b1863b216d909b5ff45743a1ce6f5273090" +SRC_URI[payloadPV.sha256sum] = "4e4e037a2b83c98c6c94818390d4bdd3f6e10f6ec62dd79188594e26190dc7b4" + +UPSTREAM_CHECK_REGEX = "docbook-xml-(?P<pver>4(\.\d+)).zip" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" do_configure (){ : @@ -36,20 +53,23 @@ do_compile (){ } do_install () { - # Refer debian https://packages.debian.org/sid/all/docbook-xml/filelist - for DTDVERSION in 4.0 4.1.2 4.2 4.3 4.4 4.5; do - install -d -m 755 ${D}${datadir}/xml/docbook/schema/dtd/${DTDVERSION} - cp -v -R docbook-${DTDVERSION}/* ${D}${datadir}/xml/docbook/schema/dtd/${DTDVERSION} - done - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/docbook-xml.xml ${D}${sysconfdir}/xml/docbook-xml.xml -} + xmlcatalog --create --noout ${D}${sysconfdir}/xml/docbook-xml.xml -do_install_append_class-native () { - # Ensure that the catalog file sgml-docbook.cat is properly - # updated when the package is installed from sstate cache. - sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xml.xml + for DTDVERSION in 4.1.2 4.2 4.3 4.4 4.5; do + DEST=${datadir}/xml/docbook/schema/dtd/$DTDVERSION + install -d -m 755 ${D}$DEST + cp -v -R docbook-$DTDVERSION/* ${D}$DEST + xmlcatalog --verbose --noout --add nextCatalog unused \ + file://$DEST/catalog.xml ${D}${sysconfdir}/xml/docbook-xml.xml + done } -FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" +# Magic environment variable is required for downstream recipe processing +XMLCATALOGS = "${sysconfdir}/xml/docbook-xml.xml" +inherit xmlcatalog + +FILES:${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" + +inherit allarch +BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml deleted file mode 100644 index c60555ae14..0000000000 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE catalog PUBLIC "-//OASIS//DTD Entity Resolution XML Catalog V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd"> -<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog"> -<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/> -<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/> -</catalog> diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index 07d32ce979..beda0abe95 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb @@ -4,7 +4,6 @@ LICENSE = "XSL" LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e" SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ - file://docbook-xsl.xml \ file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ " @@ -17,8 +16,7 @@ UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/" S = "${WORKDIR}/docbook-xsl-${PV}" -inherit allarch -BBCLASSEXTEND = "native" +inherit allarch xmlcatalog do_configure (){ : @@ -29,8 +27,6 @@ do_compile (){ } do_install () { - # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html - # for details. install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets @@ -42,22 +38,14 @@ do_install () { ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl - install -v -m644 -D README \ - ${D}${datadir}/doc/docbook-xsl-${PV}/README.txt - install -v -m644 RELEASE-NOTES* NEWS* \ - ${D}${datadir}/doc/docbook-xsl-${PV} - - install -d ${D}${sysconfdir}/xml/ - install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml - + install -d ${D}${docdir}/${BPN} + install -v -m644 README RELEASE-NOTES* NEWS* ${D}${docdir}/${BPN} } -do_install_append_class-native () { - # Ensure that the catalog file sgml-docbook.cat is properly - # updated when the package is installed from sstate cache. - sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xsl.xml -} +RDEPENDS:${PN} += "perl" +FILES:${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" +FILES:${PN}-doc = "${datadir}/doc/*" + +XMLCATALOGS = "${datadir}/xml/docbook/xsl-stylesheets-${PV}/catalog.xml" -RDEPENDS_${PN} += "perl" -FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" -FILES_${PN}-doc = "${datadir}/doc/*" +BBCLASSEXTEND = "native" |