summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-02-22 21:55:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-02-23 15:53:41 +0000
commitdca876b8f611704a238842c9e4db293d1a1be247 (patch)
treecd8d39cd763a179ad7cb134f145df3503e87e2da /meta/recipes-devtools
parentceb8863aeb6ee1a94e3f8199ee9462670129f8ef (diff)
downloadpoky-dca876b8f611704a238842c9e4db293d1a1be247.tar.gz
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>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb17
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 3615ec3721..e8a7c4513a 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
29 29
30CFLAGS =+ "-I${S}/include" 30CFLAGS =+ "-I${S}/include"
31 31
32SSTATEPOSTINSTFUNCS += "openjade_sstate_postinst"
33
32do_install() { 34do_install() {
33 # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html 35 # Refer to http://www.linuxfromscratch.org/blfs/view/stable/pst/openjade.html
34 # for details. 36 # for details.
@@ -44,13 +46,18 @@ do_install() {
44 install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV} 46 install -m 644 dsssl/catalog ${D}${datadir}/sgml/openjade-${PV}
45 install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV} 47 install -m 644 dsssl/*.{dtd,dsl,sgm} ${D}${datadir}/sgml/openjade-${PV}
46 48
47 # The catalog must live in the sysroot and it must be there for
48 # install-catalog to do its thing.
49 install -d ${datadir}/sgml/openjade-${PV} 49 install -d ${datadir}/sgml/openjade-${PV}
50 install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog 50 install -m 644 dsssl/catalog ${datadir}/sgml/openjade-${PV}/catalog
51 install-catalog --add ${sysconfdir}/sgml/openjade-${PV}.cat \
52 ${datadir}/sgml/openjade-${PV}/catalog
53 51
54 install-catalog --add ${sysconfdir}/sgml/sgml-docbook.cat \ 52 install -d ${D}${sysconfdir}/sgml
53 echo "CATALOG ${datadir}/sgml/openjade-${PV}/catalog" > \
54 ${D}${sysconfdir}/sgml/openjade-${PV}.cat
55}
56
57openjade_sstate_postinst() {
58 # Ensure that the catalog file sgml-docbook.cat is properly
59 # updated when the package is installed from sstate cache.
60 install-catalog \
61 --add ${sysconfdir}/sgml/sgml-docbook.cat \
55 ${sysconfdir}/sgml/openjade-${PV}.cat 62 ${sysconfdir}/sgml/openjade-${PV}.cat
56} 63}