diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-04-13 21:39:40 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-05-05 16:30:44 +0300 |
| commit | 82c905dc58a36aeae40b1b273a12f63fb1973cf4 (patch) | |
| tree | 38caf00263451b5036435cdc36e035b25d32e623 /poky/meta/classes/texinfo.bbclass | |
| parent | 83ecb75644b3d677c274188f9ac0b2374d6f6925 (diff) | |
| download | openbmc-82c905dc58a36aeae40b1b273a12f63fb1973cf4.tar.xz | |
meta-openembedded and poky: subtree updates
Squash of the following due to dependencies among them
and OpenBMC changes:
meta-openembedded: subtree update:d0748372d2..9201611135
meta-openembedded: subtree update:9201611135..17fd382f34
poky: subtree update:9052e5b32a..2e11d97b6c
poky: subtree update:2e11d97b6c..a8544811d7
The change log was too large for the jenkins plugin
to handle therefore it has been removed. Here is
the first and last commit of each subtree:
meta-openembedded:d0748372d2
cppzmq: bump to version 4.6.0
meta-openembedded:17fd382f34
mpv: Remove X11 dependency
poky:9052e5b32a
package_ipk: Remove pointless comment to trigger rebuild
poky:a8544811d7
pbzip2: Fix license warning
Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/classes/texinfo.bbclass')
| -rw-r--r-- | poky/meta/classes/texinfo.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/poky/meta/classes/texinfo.bbclass b/poky/meta/classes/texinfo.bbclass index 6b0def0eac..f46bacabd4 100644 --- a/poky/meta/classes/texinfo.bbclass +++ b/poky/meta/classes/texinfo.bbclass @@ -6,13 +6,13 @@ # Texinfo recipe, you can remove texinfo-native from ASSUME_PROVIDED and # makeinfo from SANITY_REQUIRED_UTILITIES. -TEXDEP = "texinfo-native" +TEXDEP = "${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'texinfo-replacement-native', 'texinfo-dummy-native', d)}" TEXDEP_class-native = "texinfo-dummy-native" TEXDEP_class-cross = "texinfo-dummy-native" +TEXDEP_class-crosssdk = "texinfo-dummy-native" +TEXDEP_class-cross-canadian = "texinfo-dummy-native" DEPENDS_append = " ${TEXDEP}" -PATH_prepend_class-native = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" -PATH_prepend_class-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" # libtool-cross doesn't inherit cross TEXDEP_pn-libtool-cross = "texinfo-dummy-native" -PATH_prepend_pn-libtool-cross = "${STAGING_BINDIR_NATIVE}/texinfo-dummy-native:" + |