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" inherit allarch BBCLASSEXTEND = "native" -SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xml_dtd_sstate_postinst" -SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xml_dtd_sysroot_preprocess" - do_configre (){ : } @@ -49,18 +46,10 @@ do_install () { install -m 755 ${WORKDIR}/docbook-xml.xml ${D}${sysconfdir}/xml/docbook-xml.xml } -docbook_xml_dtd_sstate_postinst () { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - # 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" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xml.xml - fi -} - -docbook_xml_dtd_sysroot_preprocess () { - # Update the hardcode dir in docbook-xml.xml - sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${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 } 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}" inherit allarch BBCLASSEXTEND = "native" -SSTATEPOSTINSTFUNCS_append_class-native = " docbook_xsl_stylesheets_sstate_postinst" -SYSROOT_PREPROCESS_FUNCS_append_class-native = " docbook_xsl_stylesheets_sysroot_preprocess" - do_configure (){ : } @@ -55,18 +52,10 @@ do_install () { } -docbook_xsl_stylesheets_sstate_postinst () { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - # 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" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.xml - fi -} - -docbook_xsl_stylesheets_sysroot_preprocess () { - # Update the hardcode dir in docbook-xml.xml - sed -i -e "s|file:///usr/share/xml|file://${datadir}/xml|g" ${SYSROOT_DESTDIR}${sysconfdir}/xml/docbook-xsl.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-xsl.xml } RDEPENDS_${PN} += "perl" |