[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 2/3] sgml-common: make postinst run successfully at rootfs time
From:       Qi.Chen () windriver ! com (Qi ! Chen at windriver ! com)
Date:       2013-10-31 6:00:12
Message-ID: 6c896b3102f4d17cf8e7dce16bd9b75fc08918bf.1383188560.git.Qi.Chen () windriver ! com
[Download RAW message or body]

From: Chen Qi <Qi.Chen at windriver.com>

Take $D into consideration and make postinst run successfully at
rootfs time.

Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
---
 .../sgml-common/sgml-common_0.6.3.bb               |   16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb \
b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb index 4355379..6098673 \
                100644
--- a/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
+++ b/meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb
@@ -32,6 +32,7 @@ do_compile_append() {
 FILES_${PN} += "${datadir}/sgml"
 
 pkg_postinst_${PN}() {
+    if [ "x$D" = "x" ]; then
 	install-catalog \
 		--add ${sysconfdir}/sgml/sgml-ent.cat \
 		${datadir}/sgml/sgml-iso-entities-8879.1986/catalog
@@ -39,6 +40,21 @@ pkg_postinst_${PN}() {
 	install-catalog \
 		--add ${sysconfdir}/sgml/sgml-docbook.cat \
 		${sysconfdir}/sgml/sgml-ent.cat
+    else
+	if ! grep -q ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog \
$D${sysconfdir}/sgml/sgml-ent.cat; then +	    echo "CATALOG \
${datadir}/sgml/sgml-iso-entities-8879.1986/catalog" >> \
$D${sysconfdir}/sgml/sgml-ent.cat +	fi
+	if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/catalog; then
+	    echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/catalog
+	fi
+
+	if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/sgml-docbook.cat; \
then +	    echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> \
$D${sysconfdir}/sgml/sgml-docbook.cat +	fi
+	if ! grep -q ${sysconfdir}/sgml/sgml-docbook.cat $D${sysconfdir}/sgml/catalog; then
+	    echo "CATALOG ${sysconfdir}/sgml/sgml-docbook.cat" >> \
$D${sysconfdir}/sgml/catalog +	fi
+    fi
 }
 
 pkg_postrm_${PN}() {
-- 
1.7.9.5


[prev in list] [next in list] [prev in thread] [next in thread]