Commit Graph

11 Commits

Author SHA1 Message Date
Alexander Kanavin 74bfa62f85 package_regex.inc: split entries which blacklist specific versions to their recipes
(From OE-Core rev: 1eb9e190ef3bb1170b3eaabd9f7900e7ce176624)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-12-08 10:20:52 +00:00
Robert Yang a0c83577cc 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>
2014-03-19 14:42:43 +00:00
Robert Yang 3c70ad6646 docbook-sgml-dtd-native: remove catalog file when do_clean
The docbook_sgml_dtd_sstate_postinst adds catalog file to
/etc/sgml/sgml-docbook.cat and sgml-docbook.bak, but the do_clean would not
remove the file, which would cause unexpected errors since we have multiple
versions of docbook-sgml-dtd:

docbook-sgml-dtd-3.1-native_3.1.bb
docbook-sgml-dtd-4.1-native_4.1.bb
docbook-sgml-dtd-4.5-native.bb

If we run:

$ bitbake docbook-sgml-dtd-4.1-native
$ bitbake docbook-sgml-dtd-4.1-native -ccleansstate && bitbake docbook-sgml-dtd-3.1-native
$ bitbake docbook-utils-native

We would get this error:

jade: cannot open "/path/to/etc/sgml/sgml-docbook-dtd-4.1.cat" (No such file or directory)
make[2]: *** [sgmldiff.html] Error 1

Remove the catalog entry when do_clean will fix the problem.

[YOCTO #5949]

(From OE-Core rev: 87df114982db7a94fce8622b15458bbe2d2ddacc)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-03-17 14:01:42 +00:00
Emilia Ciobanu 7b1fc1770f docbook-sgml-dtd-4.1-native: fix recipe name
Package recipe should contain version token in its name.

(From OE-Core rev: 6d4e71b72aee4cf03bc93d2143e6a6b67bf6cfee)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-31 06:59:55 +01:00
Emilia Ciobanu 3248efe40a docbook-sgml-dtd-3.1-native: fix recipe name
Package recipe should contain version token in its name.

(From OE-Core rev: c3c424b447ed4ad46263ef379b7e8892f3974821)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-31 06:59:55 +01:00
Emilia Ciobanu b23423c011 docbook-sgml-dtd-4.5-native.bb: Add real PV inside the recipe
(From OE-Core rev: 823733b7581312b0d4847b8477423942f0d34138)

Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-24 11:35:32 +01:00
Saul Wold 09b382a76f docbook-sgml-dtd-native: Write a bak file for shared state
This patch writes a sgml-docbook.bak that is read by the sgml-common during a shared
state sysroot populate, because it comes out of order.

(From OE-Core rev: 457f30a389031947f037bd7ea1217c190c2089c1)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-01 14:16:55 +01:00
Saul Wold f9fe0ae3c8 docbook-sgml-dtd-native: Add SYSROOT_PREPROCESS_FUNC
[YOCTO #1250]

This added function will install a private install-catalog binary so that shared state
can find the binary as there is not a guarantee.

(From OE-Core rev: b4eef2e1bed0536325342ca884ee0905b7e79ada)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-25 12:54:34 +01:00
Scott Garman 67f349683f docbook-sgml-dtd-native.inc: run install-catalog only during do_populate_sysroot
(From OE-Core rev: 34ec9086c429bef167554c57a80b5f69d7e61a21)

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 23:51:55 +01:00
Scott Garman 8cc18e629e docbook-sgml-dtd-native.inc: run install-catalog from SSTATEPOSTINSTFUNCS
Otherwise the sgml-docbook.cat catalog would not be updated when a build
from sstate cache is run.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2011-02-23 15:53:15 +00:00
Scott Garman b2abf1c534 docbook-sgml-dtd: new recipes - v3.1, v4.1, v4.5
These are recipes for DTDs commonly used when generating
documentation for free software. Recipes dervied from the
versions in OpenEmbedded.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
2011-02-01 23:59:35 +00:00