diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2013-10-31 14:00:12 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-01 11:09:06 +0000 |
commit | 7059097fd1ed02b0ab4944e60033c09f9f819edc (patch) | |
tree | 4b958637b5cb116ec2a84f886e8cf44118d3fe0d | |
parent | 2e0f7cfe0efa9d331785e1fcac95bd17b997983b (diff) | |
download | poky-7059097fd1ed02b0ab4944e60033c09f9f819edc.tar.gz |
sgml-common: make postinst run successfully at rootfs time
Take $D into consideration and make postinst run successfully at
rootfs time.
(From OE-Core rev: 0636093711547957a8f5b25322bd3e0da367cfc4)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/sgml-common/sgml-common_0.6.3.bb | 16 |
1 files changed, 16 insertions, 0 deletions
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() { | |||
32 | FILES_${PN} += "${datadir}/sgml" | 32 | FILES_${PN} += "${datadir}/sgml" |
33 | 33 | ||
34 | pkg_postinst_${PN}() { | 34 | pkg_postinst_${PN}() { |
35 | if [ "x$D" = "x" ]; then | ||
35 | install-catalog \ | 36 | install-catalog \ |
36 | --add ${sysconfdir}/sgml/sgml-ent.cat \ | 37 | --add ${sysconfdir}/sgml/sgml-ent.cat \ |
37 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog | 38 | ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog |
@@ -39,6 +40,21 @@ pkg_postinst_${PN}() { | |||
39 | install-catalog \ | 40 | install-catalog \ |
40 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ | 41 | --add ${sysconfdir}/sgml/sgml-docbook.cat \ |
41 | ${sysconfdir}/sgml/sgml-ent.cat | 42 | ${sysconfdir}/sgml/sgml-ent.cat |
43 | else | ||
44 | if ! grep -q ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog $D${sysconfdir}/sgml/sgml-ent.cat; then | ||
45 | echo "CATALOG ${datadir}/sgml/sgml-iso-entities-8879.1986/catalog" >> $D${sysconfdir}/sgml/sgml-ent.cat | ||
46 | fi | ||
47 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/catalog; then | ||
48 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/catalog | ||
49 | fi | ||
50 | |||
51 | if ! grep -q ${sysconfdir}/sgml/sgml-ent.cat $D${sysconfdir}/sgml/sgml-docbook.cat; then | ||
52 | echo "CATALOG ${sysconfdir}/sgml/sgml-ent.cat" >> $D${sysconfdir}/sgml/sgml-docbook.cat | ||
53 | fi | ||
54 | if ! grep -q ${sysconfdir}/sgml/sgml-docbook.cat $D${sysconfdir}/sgml/catalog; then | ||
55 | echo "CATALOG ${sysconfdir}/sgml/sgml-docbook.cat" >> $D${sysconfdir}/sgml/catalog | ||
56 | fi | ||
57 | fi | ||
42 | } | 58 | } |
43 | 59 | ||
44 | pkg_postrm_${PN}() { | 60 | pkg_postrm_${PN}() { |