Patchwork [2/3] sgml-common: make postinst run successfully at rootfs time

login
register
mail settings
Submitter Qi.Chen@windriver.com
Date Oct. 31, 2013, 6 a.m.
Message ID <6c896b3102f4d17cf8e7dce16bd9b75fc08918bf.1383188560.git.Qi.Chen@windriver.com>
Download mbox | patch
Permalink /patch/60851/
State Accepted
Commit 7059097fd1ed02b0ab4944e60033c09f9f819edc
Headers show

Comments

Qi.Chen@windriver.com - Oct. 31, 2013, 6 a.m.
From: Chen Qi <Qi.Chen@windriver.com>

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

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

Patch

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}() {