[poky] [PATCH 1/3] docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot

Scott Garman scott.a.garman at intel.com
Mon Apr 4 15:30:51 PDT 2011


From: Scott Garman <scott.a.garman at intel.com>

Signed-off-by: Scott Garman <scott.a.garman at intel.com>
---
 .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc   |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
index 83cedbc..ede7bb1 100644
--- a/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
+++ b/meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
@@ -39,9 +39,12 @@ do_install () {
 }
 
 docbook_sgml_dtd_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/sgml-docbook-dtd-${DTD_VERSION}.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/sgml-docbook-dtd-${DTD_VERSION}.cat
+	fi
 }
-- 
1.7.1




More information about the poky mailing list