diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2019-07-10 11:07:57 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-11 09:32:50 +0100 |
commit | 43a08e1936119e2e4a9223fb87b4a0e548271686 (patch) | |
tree | 015122b3858a2e5fbaf2ff938eaf7100ff54dad5 /meta | |
parent | 78e9bc140e2c5d8a37e53eeb849d8a5aa061a410 (diff) | |
download | poky-43a08e1936119e2e4a9223fb87b4a0e548271686.tar.gz |
xmlcatalog: hold libxml2-native dependency
Put libxml2-native dependency in this class and remove
it from recipes inheriting this class.
In fact, if a recipe inherits this class and does not have
libxml2-native, the xmlcatalog_sstate_postinst would fail.
(From OE-Core rev: 5a72c6d5cc1c9896c7425ac20eaf82d3d489e5c7)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/xmlcatalog.bbclass | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/meta/classes/xmlcatalog.bbclass b/meta/classes/xmlcatalog.bbclass index 075aef8c0c..ae4811fdeb 100644 --- a/meta/classes/xmlcatalog.bbclass +++ b/meta/classes/xmlcatalog.bbclass | |||
@@ -1,3 +1,5 @@ | |||
1 | DEPENDS = "libxml2-native" | ||
2 | |||
1 | # A whitespace-separated list of XML catalogs to be registered, for example | 3 | # A whitespace-separated list of XML catalogs to be registered, for example |
2 | # "${sysconfdir}/xml/docbook-xml.xml". | 4 | # "${sysconfdir}/xml/docbook-xml.xml". |
3 | XMLCATALOGS ?= "" | 5 | XMLCATALOGS ?= "" |
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb index 4b6a28e34c..6452c8d99f 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xml-dtd4_4.5.bb | |||
@@ -8,8 +8,6 @@ HOMEPAGE = "http://www.docbook.org/xml/" | |||
8 | LICENSE = "OASIS" | 8 | LICENSE = "OASIS" |
9 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" | 9 | LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENSE-OASIS;md5=c608985dd5f7f215e669e7639a0b1d2e" |
10 | 10 | ||
11 | DEPENDS = "libxml2-native" | ||
12 | |||
13 | # Note: the upstream sources are not distributed with a license file. | 11 | # Note: the upstream sources are not distributed with a license file. |
14 | # LICENSE-OASIS is included as a "patch" to workaround this. When | 12 | # LICENSE-OASIS is included as a "patch" to workaround this. When |
15 | # upgrading this recipe, please verify whether this is still needed. | 13 | # upgrading this recipe, please verify whether this is still needed. |
diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index ff38e874b3..c5d3a24808 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb | |||
@@ -14,8 +14,6 @@ UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/ | |||
14 | # Reject versions ending in .0 as those are release candidates | 14 | # Reject versions ending in .0 as those are release candidates |
15 | UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/" | 15 | UPSTREAM_CHECK_REGEX = "/docbook-xsl/(?P<pver>(\d+[\.\-_]*)+(?!\.0)\.\d+)/" |
16 | 16 | ||
17 | DEPENDS = "libxml2-native" | ||
18 | |||
19 | S = "${WORKDIR}/docbook-xsl-${PV}" | 17 | S = "${WORKDIR}/docbook-xsl-${PV}" |
20 | 18 | ||
21 | inherit allarch xmlcatalog | 19 | inherit allarch xmlcatalog |