diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2014-04-24 15:59:20 -0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-25 17:19:19 +0100 |
| commit | 4c14b094985216c433d330fb3d9532d4b6c91fcf (patch) | |
| tree | 6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-sato | |
| parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
| download | ast2050-yocto-poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.zip ast2050-yocto-poky-4c14b094985216c433d330fb3d9532d4b6c91fcf.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 OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
4 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb index 8d43785..da4d98a 100644 --- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb +++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb @@ -11,4 +11,4 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}" S = "${WORKDIR}/git" -EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb index 31d32c6..490e2bc 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" -DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" -DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" +DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" +DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" PV = "2.0+git${SRCPV}" @@ -22,8 +22,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \ file://silence-warnings.patch" EXTRA_OECONF = "--enable-startup-notification --enable-dbus" -EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" -EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" +EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" +EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb index 23dc043..0d3569d 100644 --- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb +++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb @@ -7,6 +7,6 @@ DEFAULT_PREFERENCE = "-1" SRC_URI = "git://git.yoctoproject.org/matchbox-sato" -EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" +EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" S = "${WORKDIR}/git" diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb index 3db8e6d..29f8a79 100644 --- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb +++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb @@ -15,7 +15,7 @@ ICU_LIB_powerpc = "pango" DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" -DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" +DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" SRC_URI = "\ http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ @@ -47,7 +47,7 @@ EXTRA_OECONF = "\ --enable-link-prefetch \ --with-gtk=2.0 \ --disable-geolocation \ - ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ UNICODE_CFLAGS=-D_REENTRANT \ " |
