diff options
| author | Scott Garman <scott.a.garman@intel.com> | 2011-02-22 21:55:40 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-23 15:53:41 +0000 |
| commit | dca876b8f611704a238842c9e4db293d1a1be247 (patch) | |
| tree | cd8d39cd763a179ad7cb134f145df3503e87e2da | |
| parent | ceb8863aeb6ee1a94e3f8199ee9462670129f8ef (diff) | |
| download | openembedded-core-dca876b8f611704a238842c9e4db293d1a1be247.tar.gz openembedded-core-dca876b8f611704a238842c9e4db293d1a1be247.tar.bz2 openembedded-core-dca876b8f611704a238842c9e4db293d1a1be247.tar.xz openembedded-core-dca876b8f611704a238842c9e4db293d1a1be247.zip | |
openjade-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>
| -rw-r--r-- | meta/recipes-devtools/openjade/openjade-native_1.3.2.bb | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb index 3615ec372..e8a7c4513 100644 --- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb +++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb @@ -29,6 +29,8 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS', True).replace('--datadir=${datadi CFLAGS =+ "-I${S}/include" +SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst" + do_install() { # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html # for details. @@ -44,13 +46,18 @@ do_install() { install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} - # The catalog must live in the sysroot and it must be there for - # install-catalog to do its thing. install -d ${datadir}/sgml/openjade-${PV} install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog - install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \ - ${datadir}/sgml/openjade-${PV}/catalog - install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \ + install -d ${D}${sysconfdir}/sgml + echo "CATALOG ${datadir}/sgml/openjade-${PV}/catalog" > \ + ${D}${sysconfdir}/sgml/openjade-${PV}.cat +} + +openjade_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/openjade-${PV}.cat } |