summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 15:59:20 -0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 17:20:28 +0100
commit1528e596d4906c33e4be83fcf691cfe76d340ff3 (patch)
tree2941a4e853ad74f1066650e27db5f5dbbf4bb75f /meta-yocto/conf
parentb5606f32cdf9d0055e8ec7329d77693fe88db19a (diff)
downloadpoky-1528e596d4906c33e4be83fcf691cfe76d340ff3.tar.gz
Globally replace 'base_contains' calls with 'bb.utils.contains'
The base_contains is kept as a compatibility method and we ought to not use it in OE-Core so we can remove it from base metadata in future. (From meta-yocto rev: 5021839af713cb34bea5888981f2184104b6d35e) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto/conf')
-rw-r--r--meta-yocto/conf/distro/poky.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 062530d89d..ab01bbb52a 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -35,7 +35,7 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
35DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 35DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
36DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" 36DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
37 37
38POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}" 38POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}"
39DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" 39DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
40DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" 40DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"
41DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" 41DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}"