aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 12:46:14 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-12 15:58:09 +1200
commitdc3b94ace3db53d1cc0797af1c6b0adde81831f3 (patch)
tree9aa24e3c08e6dace3f5aab31b728dc85720e62bd
parent1553d287a9c29f38d7754390fb8e2f05607ca5f4 (diff)
downloadmeta-opie-dc3b94ace3db53d1cc0797af1c6b0adde81831f3.zip
meta-opie-dc3b94ace3db53d1cc0797af1c6b0adde81831f3.tar.gz
meta-opie-dc3b94ace3db53d1cc0797af1c6b0adde81831f3.tar.bz2
packagegroup-opie*: replace base_contains with bb.utils.contains.
Silence NOTE: /oe/meta-opie/recipes-opie/images/opie-image.bb: base_contains is deprecated, please use bb.utils.contains instead. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie-16mb.bb8
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie.bb16
2 files changed, 12 insertions, 12 deletions
diff --git a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
index b7aafdb..d60925e 100644
--- a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
@@ -29,10 +29,10 @@ RDEPENDS_packagegroup-opie-16mb-applets = "opie-aboutapplet opie-clockapplet opi
opie-homeapplet opie-rotateapplet \
opie-brightnessapplet opie-volumeapplet \
opie-screenshotapplet \
- ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+ ${@bb.utils.contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+ ${@bb.utils.contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+ ${@bb.utils.contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
+ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
#
# clamshell models can benefit from the autorotate applet
diff --git a/recipes-opie/packagegroups/packagegroup-opie.bb b/recipes-opie/packagegroups/packagegroup-opie.bb
index 74fbcb4..58295ed 100644
--- a/recipes-opie/packagegroups/packagegroup-opie.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie.bb
@@ -17,8 +17,8 @@ PACKAGES = "packagegroup-opie-base \
packagegroup-opie-base-styles packagegroup-opie-base-todayplugins \
packagegroup-opie-extra-settings \
packagegroup-opie-extra-styles \
- ${@base_contains("COMBINED_FEATURES", "bluetooth", "packagegroup-opie-bluetooth", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "irda", "packagegroup-opie-irda", "",d)} \
+ ${@bb.utils.contains("COMBINED_FEATURES", "bluetooth", "packagegroup-opie-bluetooth", "",d)} \
+ ${@bb.utils.contains("COMBINED_FEATURES", "irda", "packagegroup-opie-irda", "",d)} \
"
RDEPENDS_packagegroup-opie-everything := "${PACKAGES}"
@@ -44,10 +44,10 @@ RDEPENDS_packagegroup-opie-base-applets = "opie-aboutapplet opie-clockapplet opi
opie-homeapplet opie-rotateapplet \
opie-brightnessapplet opie-volumeapplet \
opie-screenshotapplet \
- ${@base_contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
- ${@base_contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
+ ${@bb.utils.contains("COMBINED_FEATURES", "irda", "opie-irdaapplet", "",d)} \
+ ${@bb.utils.contains("MACHINE_FEATURES", "apm", "opie-batteryapplet", "",d)} \
+ ${@bb.utils.contains("COMBINED_FEATURES", "pcmcia", "opie-cardapplet", "",d)} \
+ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "opie-vtapplet opie-logoutapplet", "",d)}"
#
# clamshell models can benefit from the autorotate applet
@@ -71,8 +71,8 @@ RDEPENDS_packagegroup-opie-base-settings = "opie-light-and-power opie-appearance
# That settings can be removed and device will be still usable
#
RDEPENDS_packagegroup-opie-extra-settings = "opie-language opie-doctab opie-mediummount \
- ${@base_contains("DISTRO_FEATURES", "wifi", "opie-networksettings-wlanplugin", "",d)} \
- ${@base_contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "wifi", "opie-networksettings-wlanplugin", "",d)} \
+ ${@bb.utils.contains("DISTRO_FEATURES", "ppp", "opie-networksettings-pppplugin", "",d)} \
"
RDEPENDS_packagegroup-opie-base-decorations = "opie-deco-flat opie-deco-liquid opie-deco-polished"