summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2011-04-04 13:07:17 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-04 23:45:20 +0100
commit638a3d15a84edfdd218a8c40306482f6c086b4e7 (patch)
treecf71df83c80dd5cd4435074c74cda2f293a61e8e
parent34ec9086c429bef167554c57a80b5f69d7e61a21 (diff)
downloadopenembedded-core-638a3d15a84edfdd218a8c40306482f6c086b4e7.tar.gz
openembedded-core-638a3d15a84edfdd218a8c40306482f6c086b4e7.tar.bz2
openembedded-core-638a3d15a84edfdd218a8c40306482f6c086b4e7.zip
openjade-native: run install-catalog only during do_populate_sysroot
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
-rw-r--r--meta/recipes-devtools/openjade/openjade-native_1.3.2.bb13
1 files changed, 8 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 5c1037a5de..1c672e109e 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -62,9 +62,12 @@ do_install() {
}
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
+ if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+ then
+ # 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
+ fi
}