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>

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 3615ec3721275ad00133e4170ca39a1bf9dd07d1..e8a7c4513a547bfbf1abc80b047799ab492558ff 100644 (file)
--- 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
 }