summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets/docbook-xsl.xml6
-rw-r--r--meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb21
2 files changed, 7 insertions, 20 deletions
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 @@
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<delegateURI uriStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/>
5<delegateSystem systemIdStartString="http://docbook.sourceforge.net/release/xsl/" catalog="file:///usr/share/xml/docbook/xsl-stylesheets/catalog.xml"/>
6</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 036fc15dc9..ff38e874b3 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"
4LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e" 4LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e"
5 5
6SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ 6SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \
7 file://docbook-xsl.xml \
8 file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ 7 file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \
9" 8"
10 9
@@ -15,10 +14,11 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/
15# Reject versions ending in .0 as those are release candidates 14# Reject versions ending in .0 as those are release candidates
16UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/" 15UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/"
17 16
17DEPENDS = "libxml2-native"
18
18S = "${WORKDIR}/docbook-xsl-${PV}" 19S = "${WORKDIR}/docbook-xsl-${PV}"
19 20
20inherit allarch 21inherit allarch xmlcatalog
21BBCLASSEXTEND = "native"
22 22
23do_configure (){ 23do_configure (){
24 : 24 :
@@ -29,8 +29,6 @@ do_compile (){
29} 29}
30 30
31do_install () { 31do_install () {
32 # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-xsl.html
33 # for details.
34 install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} 32 install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV}
35 ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets 33 ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets
36 34
@@ -44,17 +42,12 @@ do_install () {
44 42
45 install -d ${D}${docdir}/${BPN} 43 install -d ${D}${docdir}/${BPN}
46 install -v -m644 README RELEASE-NOTES* NEWS* ${D}${docdir}/${BPN} 44 install -v -m644 README RELEASE-NOTES* NEWS* ${D}${docdir}/${BPN}
47
48 install -d ${D}${sysconfdir}/xml/
49 install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml
50}
51
52do_install_append_class-native () {
53 # Ensure that the catalog file sgml-docbook.cat is properly
54 # updated when the package is installed from sstate cache.
55 sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xsl.xml
56} 45}
57 46
58RDEPENDS_${PN} += "perl" 47RDEPENDS_${PN} += "perl"
59FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml" 48FILES_${PN} = "${datadir}/xml/* ${sysconfdir}/xml/docbook-xsl.xml"
60FILES_${PN}-doc = "${datadir}/doc/*" 49FILES_${PN}-doc = "${datadir}/doc/*"
50
51XMLCATALOGS = "${datadir}/xml/docbook/xsl-stylesheets-${PV}/catalog.xml"
52
53BBCLASSEXTEND = "native"