From 0636093711547957a8f5b25322bd3e0da367cfc4 Mon Sep 17 00:00:00 2001 From: Chen Qi Date: Thu, 31 Oct 2013 14:00:12 +0800 Subject: [PATCH] sgml-common: make postinst run successfully at rootfs time Take $D into consideration and make postinst run successfully at rootfs time. Signed-off-by: Chen Qi Signed-off-by: Saul Wold --- .../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 43553795f1..6098673a35 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}() { -- 2.40.1