summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/docbook-sgml-dtd
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-03-18 15:54:34 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-19 14:42:43 +0000
commita0c83577cc108aaae8632fe44f0c1bd46995b264 (patch)
tree3f4b257f14d4381fe2da68994a431e8e5d9a9303 /meta/recipes-devtools/docbook-sgml-dtd
parent779f5936f18c1c974cde477c68e775e95668cb08 (diff)
downloadpoky-a0c83577cc108aaae8632fe44f0c1bd46995b264.tar.gz
sgml-common-native: fix the generation of sgml-docbook.cat
There would be build errors if multiple builds use the same SSTATE_DIR, and the builds use the different versions' docbook-sgml-dtd-native, the problems are: we have multiple versions docbook-sgml-dtd-native: docbook-sgml-dtd-3.1-native docbook-sgml-dtd-4.1-native docbook-sgml-dtd-4.5-native And they depend on sgml-common-native which installs the file sysroot/etc/sgml/sgml-docbook.cat, this file is also included in the sstate cache file (.tar.gz), but both the 3 versions docbook-sgml-dtd-native may update the sysroot/ect/sgml/sgml-docbook.cat, and it is a hardlink to SYSROOT_DESTDIR/etc/sgml/sgml-docbook.cat, so the sgml-docbook.cat in the sstate cache file may contain the docbook-sgml-dtd-<version>-native's info, and there would be errors when we mirror the sstate-cache to another build which uses a different version. Now we exclude the sgml-docbook.cat from the ${D}, and generate sysroot/ect/sgml/sgml-docbook.cat dynamically will fix the problem, both the sgml-common-native and docbook-sgml-dtd-<version>-native can update it it correctly. The similar to docbook-dsssl-stylesheets-native and openjade-native. [YOCTO #5994] (From OE-Core rev: 50683df81e1605ad7c03bc633aa55da7e97cfe62) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/docbook-sgml-dtd')
-rw-r--r--meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc10
1 files changed, 4 insertions, 6 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 b2381bd7d1..af50987968 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
@@ -63,10 +63,8 @@ CLEANFUNCS += "docbook_sgml_dtd_sstate_clean"
63docbook_sgml_dtd_sstate_clean () { 63docbook_sgml_dtd_sstate_clean () {
64 # Ensure that the catalog file sgml-docbook.cat is properly 64 # Ensure that the catalog file sgml-docbook.cat is properly
65 # updated when the package is removed from sstate cache. 65 # updated when the package is removed from sstate cache.
66 if [ -f ${sysconfdir}/sgml/sgml-docbook.bak ]; then 66 files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat"
67 sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ 67 for f in $files; do
68 ${sysconfdir}/sgml/sgml-docbook.bak 68 [ ! -f $f ] || sed -i '/\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat/d' $f
69 sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ 69 done
70 ${sysconfdir}/sgml/sgml-docbook.cat
71 fi
72} 70}