summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/docbook-dsssl-stylesheets
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-22 18:43:43 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 15:53:31 +0000
commitceb8863aeb6ee1a94e3f8199ee9462670129f8ef (patch)
tree9834093dc0b3367822db53aea64d2bd278100ab2 /meta/recipes-devtools/docbook-dsssl-stylesheets
parent8cc18e629e73ef42b8baa84ec8c28b1677fe2602 (diff)
downloadast2050-yocto-poky-ceb8863aeb6ee1a94e3f8199ee9462670129f8ef.zip
ast2050-yocto-poky-ceb8863aeb6ee1a94e3f8199ee9462670129f8ef.tar.gz
docbook-dsssl-stylesheets-native: run install-catalog from SSTATEPOSTINSTFUNCS
Otherwise the sgml-docbook.cat catalog would not be updated when a build from sstate cache is run. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Diffstat (limited to 'meta/recipes-devtools/docbook-dsssl-stylesheets')
-rw-r--r--meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb30
1 files changed, 12 insertions, 18 deletions
diff --git a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
index 53e9865..fc4d266 100644
--- a/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
+++ b/meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=41;endline=74;md5=875385159b2ee76ecf
DEPENDS = "sgml-common-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-dsssl-${PV}.tar.bz2"
@@ -18,7 +18,7 @@ S = "${WORKDIR}/docbook-dsssl-${PV}"
inherit native
-SYSROOT_PREPROCESS_FUNCS += "docbook_dssl_stylesheets_native_mangle"
+SSTATEPOSTINSTFUNCS += "docbook_dsssl_stylesheets_sstate_postinst"
do_install () {
# Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/docbook-dsssl.html
@@ -30,23 +30,17 @@ do_install () {
install -m 0644 catalog ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}
cp -v -R * ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}
- install-catalog --add ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat \
- ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/catalog
-
- install-catalog --add ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat \
- ${D}${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/common/catalog
-
- install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \
- ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
-
- # Move these to the image directory so they get staged properly.
install -d ${D}${sysconfdir}/sgml
- cp ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat ${D}${sysconfdir}/sgml/
- cp ${sysconfdir}/sgml/sgml-docbook.cat ${D}${sysconfdir}/sgml/
- cp ${sysconfdir}/sgml/catalog ${D}${sysconfdir}/sgml/
+ echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/catalog" > \
+ ${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+ echo "CATALOG ${datadir}/sgml/docbook/dsssl-stylesheets-${PV}/common/catalog" >> \
+ ${D}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
}
-docbook_dssl_stylesheets_native_mangle () {
- # Remove the image directory path ${D} from the .cat file.
- sed -i -e "s|${D}||g" ${SYSROOT_DESTDIR}${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
+docbook_dsssl_stylesheets_sstate_postinst () {
+ # Ensure that the catalog file sgml-docbook.cat is properly
+ # updated when the package is installed from sstate cache.
+ install-catalog \
+ --add ${sysconfdir}/sgml/sgml-docbook.cat \
+ ${sysconfdir}/sgml/dsssl-docbook-stylesheets.cat
}
OpenPOWER on IntegriCloud