]> code.ossystems Code Review - openembedded-core.git/commit
sgml-common-native: fix the generation of sgml-docbook.cat
authorRobert Yang <liezhi.yang@windriver.com>
Tue, 18 Mar 2014 07:54:34 +0000 (15:54 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 19 Mar 2014 14:20:36 +0000 (14:20 +0000)
commit50683df81e1605ad7c03bc633aa55da7e97cfe62
tree505c7bb36b6212dc5de5999e377040c6ef609f1e
parenta8fe5fd62fd98e33180f3de700ed01f9efb74a50
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]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-native_1.79.bb
meta/recipes-devtools/docbook-sgml-dtd/docbook-sgml-dtd-native.inc
meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
meta/recipes-devtools/sgml-common/sgml-common-native_0.6.3.bb