diff options
Diffstat (limited to 'meta/recipes-devtools/docbook-xml')
-rw-r--r-- | meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | 19 | ||||
-rw-r--r-- | meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | 19 |
2 files changed, 8 insertions, 30 deletions
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 2f13dba52c..05a04d8df5 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 | |||
@@ -27,9 +27,6 @@ S="${WORKDIR}/docbook-xml-4.5.c31424" | |||
27 | inherit allarch | 27 | inherit allarch |
28 | BBCLASSEXTEND = "native" | 28 | BBCLASSEXTEND = "native" |
29 | 29 | ||
30 | SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xml_dtd_sstate_postinst" | ||
31 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xml_dtd_sysroot_preprocess" | ||
32 | |||
33 | do_configre (){ | 30 | do_configre (){ |
34 | : | 31 | : |
35 | } | 32 | } |
@@ -49,18 +46,10 @@ do_install () { | |||
49 | install -m 755 ${WORKDIR}/docbook-xml.xml ${D}${sysconfdir}/xml/docbook-xml.xml | 46 | install -m 755 ${WORKDIR}/docbook-xml.xml ${D}${sysconfdir}/xml/docbook-xml.xml |
50 | } | 47 | } |
51 | 48 | ||
52 | docbook_xml_dtd_sstate_postinst () { | 49 | do_install_append_class-native () { |
53 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | 50 | # Ensure that the catalog file sgml-docbook.cat is properly |
54 | then | 51 | # updated when the package is installed from sstate cache. |
55 | # Ensure that the catalog file sgml-docbook.cat is properly | 52 | sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xml.xml |
56 | # updated when the package is installed from sstate cache. | ||
57 | sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xml.xml | ||
58 | fi | ||
59 | } | ||
60 | |||
61 | docbook_xml_dtd_sysroot_preprocess () { | ||
62 | # Update the hardcode dir in docbook-xml.xml | ||
63 | sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xml.xml | ||
64 | } | 53 | } |
65 | 54 | ||
66 | FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" | 55 | FILES_${PN} = "${datadir}/* ${sysconfdir}/xml/docbook-xml.xml" |
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 aa03a82a2a..07d32ce979 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 | |||
@@ -20,9 +20,6 @@ S = "${WORKDIR}/docbook-xsl-${PV}" | |||
20 | inherit allarch | 20 | inherit allarch |
21 | BBCLASSEXTEND = "native" | 21 | BBCLASSEXTEND = "native" |
22 | 22 | ||
23 | SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xsl_stylesheets_sstate_postinst" | ||
24 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xsl_stylesheets_sysroot_preprocess" | ||
25 | |||
26 | do_configure (){ | 23 | do_configure (){ |
27 | : | 24 | : |
28 | } | 25 | } |
@@ -55,18 +52,10 @@ do_install () { | |||
55 | 52 | ||
56 | } | 53 | } |
57 | 54 | ||
58 | docbook_xsl_stylesheets_sstate_postinst () { | 55 | do_install_append_class-native () { |
59 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | 56 | # Ensure that the catalog file sgml-docbook.cat is properly |
60 | then | 57 | # updated when the package is installed from sstate cache. |
61 | # Ensure that the catalog file sgml-docbook.cat is properly | 58 | sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${D}${sysconfdir}/xml/docbook-xsl.xml |
62 | # updated when the package is installed from sstate cache. | ||
63 | sed -i -e "s|file://.*/usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml | ||
64 | fi | ||
65 | } | ||
66 | |||
67 | docbook_xsl_stylesheets_sysroot_preprocess () { | ||
68 | # Update the hardcode dir in docbook-xml.xml | ||
69 | sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml | ||
70 | } | 59 | } |
71 | 60 | ||
72 | RDEPENDS_${PN} += "perl" | 61 | RDEPENDS_${PN} += "perl" |