From: Scott Garman <scott.a.garman@intel.com>
Date: Wed, 23 Feb 2011 05:55:40 +0000 (-0800)
Subject: openjade-native: run install-catalog from SSTATEPOSTINSTFUNCS
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~46421
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dca876b8f611704a238842c9e4db293d1a1be247;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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 3615ec37212..e8a7c4513a5 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
 }