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/matchbox-panel-2 | |
parent | 08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff) | |
download | 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/matchbox-panel-2')
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb | 8 |
1 files changed, 4 insertions, 4 deletions
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 31d32c6ec8..490e2bc86b 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 \ | |||
8 | file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" | 8 | file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" |
9 | 9 | ||
10 | DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" | 10 | DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" |
11 | DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | 11 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" |
12 | DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | 12 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" |
13 | 13 | ||
14 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" | 14 | SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" |
15 | PV = "2.0+git${SRCPV}" | 15 | PV = "2.0+git${SRCPV}" |
@@ -22,8 +22,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \ | |||
22 | file://silence-warnings.patch" | 22 | file://silence-warnings.patch" |
23 | 23 | ||
24 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" | 24 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" |
25 | EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" | 25 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" |
26 | EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" | 26 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" |
27 | 27 | ||
28 | S = "${WORKDIR}/git" | 28 | S = "${WORKDIR}/git" |
29 | 29 | ||