From 50683df81e1605ad7c03bc633aa55da7e97cfe62 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 18 Mar 2014 15:54:34 +0800 Subject: 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--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--native can update it it correctly. The similar to docbook-dsssl-stylesheets-native and openjade-native. [YOCTO #5994] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- .../docbook-sgml-dtd/docbook-sgml-dtd-native.inc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'meta/recipes-devtools/docbook-sgml-dtd') 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" docbook_sgml_dtd_sstate_clean () { # Ensure that the catalog file sgml-docbook.cat is properly # updated when the package is removed from sstate cache. - if [ -f ${sysconfdir}/sgml/sgml-docbook.bak ]; then - sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ - ${sysconfdir}/sgml/sgml-docbook.bak - sed -i '/'"\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat"'/d' \ - ${sysconfdir}/sgml/sgml-docbook.cat - fi + files="${sysconfdir}/sgml/sgml-docbook.bak ${sysconfdir}/sgml/sgml-docbook.cat" + for f in $files; do + [ ! -f $f ] || sed -i '/\/sgml\/sgml-docbook-dtd-${DTD_VERSION}.cat/d' $f + done } -- cgit 1.2.3-korg