summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/packagegroups
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:19:19 +0100
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079 /meta/recipes-core/packagegroups
parent08a38a7865c41ec60f4b993b964f8d477ea0f680 (diff)
downloadpoky-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-core/packagegroups')
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb122
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb6
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb6
4 files changed, 69 insertions, 69 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 368c318f01..16f3a510d8 100644
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -11,31 +11,31 @@ PACKAGES = ' \
11 packagegroup-distro-base \ 11 packagegroup-distro-base \
12 packagegroup-machine-base \ 12 packagegroup-machine-base \
13 \ 13 \
14 ${@base_contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ 14 ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \
15 ${@base_contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ 15 ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \
16 ${@base_contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ 16 ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \
17 ${@base_contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ 17 ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \
18 ${@base_contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ 18 ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \
19 ${@base_contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \ 19 ${@bb.utils.contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \
20 ${@base_contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ 20 ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \
21 ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \ 21 ${@bb.utils.contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
22 ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \ 22 ${@bb.utils.contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
23 ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \ 23 ${@bb.utils.contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
24 ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \ 24 ${@bb.utils.contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
25 ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \ 25 ${@bb.utils.contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
26 ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \ 26 ${@bb.utils.contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
27 \ 27 \
28 ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ 28 ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
29 ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ 29 ${@bb.utils.contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
30 ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ 30 ${@bb.utils.contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \
31 ${@base_contains("DISTRO_FEATURES", "nfc", "packagegroup-base-nfc", "", d)} \ 31 ${@bb.utils.contains("DISTRO_FEATURES", "nfc", "packagegroup-base-nfc", "", d)} \
32 ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ 32 ${@bb.utils.contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \
33 ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ 33 ${@bb.utils.contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \
34 ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ 34 ${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \
35 ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \ 35 ${@bb.utils.contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
36 ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \ 36 ${@bb.utils.contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \ 37 ${@bb.utils.contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \ 38 ${@bb.utils.contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
39 \ 39 \
40 ' 40 '
41 41
@@ -56,31 +56,31 @@ RDEPENDS_packagegroup-base = "\
56 \ 56 \
57 sysfsutils \ 57 sysfsutils \
58 module-init-tools \ 58 module-init-tools \
59 ${@base_contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ 59 ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \
60 ${@base_contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ 60 ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \
61 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ 61 ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \
62 ${@base_contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ 62 ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \
63 \ 63 \
64 ${@base_contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \ 64 ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \
65 ${@base_contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \ 65 ${@bb.utils.contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \
66 ${@base_contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \ 66 ${@bb.utils.contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \
67 ${@base_contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \ 67 ${@bb.utils.contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \
68 ${@base_contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \ 68 ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \
69 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \ 69 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \
70 ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \ 70 ${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
71 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \ 71 ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \
72 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ 72 ${@bb.utils.contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
73 ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ 73 ${@bb.utils.contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
74 ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ 74 ${@bb.utils.contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
75 ${@base_contains('COMBINED_FEATURES', 'nfc', 'packagegroup-base-nfc', '',d)} \ 75 ${@bb.utils.contains('COMBINED_FEATURES', 'nfc', 'packagegroup-base-nfc', '',d)} \
76 \ 76 \
77 ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ 77 ${@bb.utils.contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
78 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ 78 ${@bb.utils.contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \
79 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \ 79 ${@bb.utils.contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \
80 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \ 80 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
81 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \ 81 ${@bb.utils.contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
82 ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \ 82 ${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
83 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \ 83 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
84 " 84 "
85 85
86 86
@@ -204,14 +204,14 @@ RRECOMMENDS_packagegroup-base-pcmcia = "\
204 kernel-module-serial-cs \ 204 kernel-module-serial-cs \
205 kernel-module-ide-cs \ 205 kernel-module-ide-cs \
206 kernel-module-ide-disk \ 206 kernel-module-ide-disk \
207 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ 207 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
208 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ 208 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
209 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" 209 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
210 210
211SUMMARY_packagegroup-base-bluetooth = "Bluetooth support" 211SUMMARY_packagegroup-base-bluetooth = "Bluetooth support"
212RDEPENDS_packagegroup-base-bluetooth = "\ 212RDEPENDS_packagegroup-base-bluetooth = "\
213 bluez4 \ 213 bluez4 \
214 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ 214 ${@bb.utils.contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
215 " 215 "
216 216
217RRECOMMENDS_packagegroup-base-bluetooth = "\ 217RRECOMMENDS_packagegroup-base-bluetooth = "\
@@ -223,11 +223,11 @@ RRECOMMENDS_packagegroup-base-bluetooth = "\
223 kernel-module-hidp \ 223 kernel-module-hidp \
224 kernel-module-hci-uart \ 224 kernel-module-hci-uart \
225 kernel-module-sco \ 225 kernel-module-sco \
226 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ 226 ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
227 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ 227 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
228 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ 228 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
229 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ 229 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
230 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ 230 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
231 " 231 "
232 232
233SUMMARY_packagegroup-base-irda = "IrDA support" 233SUMMARY_packagegroup-base-irda = "IrDA support"
@@ -240,12 +240,12 @@ RRECOMMENDS_packagegroup-base-irda = "\
240 kernel-module-ircomm \ 240 kernel-module-ircomm \
241 kernel-module-ircomm-tty \ 241 kernel-module-ircomm-tty \
242 kernel-module-irlan \ 242 kernel-module-irlan \
243 ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ 243 ${@bb.utils.contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
244 kernel-module-irport \ 244 kernel-module-irport \
245 kernel-module-irtty \ 245 kernel-module-irtty \
246 kernel-module-irtty-sir \ 246 kernel-module-irtty-sir \
247 kernel-module-sir-dev \ 247 kernel-module-sir-dev \
248 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " 248 ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
249 249
250SUMMARY_packagegroup-base-usbgadget = "USB gadget support" 250SUMMARY_packagegroup-base-usbgadget = "USB gadget support"
251RRECOMMENDS_packagegroup-base-usbgadget = "\ 251RRECOMMENDS_packagegroup-base-usbgadget = "\
@@ -299,12 +299,12 @@ RRECOMMENDS_packagegroup-base-ipsec = "\
299SUMMARY_packagegroup-base-wifi = "WiFi support" 299SUMMARY_packagegroup-base-wifi = "WiFi support"
300RDEPENDS_packagegroup-base-wifi = "\ 300RDEPENDS_packagegroup-base-wifi = "\
301 wireless-tools \ 301 wireless-tools \
302 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ 302 ${@bb.utils.contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
303 ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ 303 ${@bb.utils.contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
304 wpa-supplicant" 304 wpa-supplicant"
305 305
306RRECOMMENDS_packagegroup-base-wifi = "\ 306RRECOMMENDS_packagegroup-base-wifi = "\
307 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ 307 ${@bb.utils.contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
308 kernel-module-ieee80211-crypt \ 308 kernel-module-ieee80211-crypt \
309 kernel-module-ieee80211-crypt-ccmp \ 309 kernel-module-ieee80211-crypt-ccmp \
310 kernel-module-ieee80211-crypt-tkip \ 310 kernel-module-ieee80211-crypt-tkip \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 1154bc05b5..c8bc362242 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_init_manager ?= "sysvinit"
29VIRTUAL-RUNTIME_initscripts ?= "initscripts" 29VIRTUAL-RUNTIME_initscripts ?= "initscripts"
30VIRTUAL-RUNTIME_keymaps ?= "keymaps" 30VIRTUAL-RUNTIME_keymaps ?= "keymaps"
31 31
32SYSVINIT_SCRIPTS = "${@base_contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \ 32SYSVINIT_SCRIPTS = "${@bb.utils.contains('MACHINE_FEATURES', 'rtc', 'busybox-hwclock', '', d)} \
33 modutils-initscripts \ 33 modutils-initscripts \
34 init-ifupdown \ 34 init-ifupdown \
35 " 35 "
@@ -38,8 +38,8 @@ RDEPENDS_${PN} = "\
38 base-files \ 38 base-files \
39 base-passwd \ 39 base-passwd \
40 busybox \ 40 busybox \
41 ${@base_contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ 41 ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \
42 ${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ 42 ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
43 netbase \ 43 netbase \
44 ${VIRTUAL-RUNTIME_login_manager} \ 44 ${VIRTUAL-RUNTIME_login_manager} \
45 ${VIRTUAL-RUNTIME_init_manager} \ 45 ${VIRTUAL-RUNTIME_init_manager} \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 80f3031ff5..7832c89d23 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -16,8 +16,8 @@ RPROVIDES_${PN} = "task-core-tools-profile"
16RREPLACES_${PN} = "task-core-tools-profile" 16RREPLACES_${PN} = "task-core-tools-profile"
17RCONFLICTS_${PN} = "task-core-tools-profile" 17RCONFLICTS_${PN} = "task-core-tools-profile"
18 18
19PROFILE_TOOLS_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" 19PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
20PROFILE_TOOLS_SYSTEMD = "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" 20PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
21 21
22RRECOMMENDS_${PN} = "\ 22RRECOMMENDS_${PN} = "\
23 perf \ 23 perf \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 952fbd0d1a..c7667540c9 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -57,7 +57,7 @@ RDEPENDS_${PN} = "\
57 connman-tools \ 57 connman-tools \
58 connman-tests \ 58 connman-tests \
59 connman-client \ 59 connman-client \
60 ${@base_contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \ 60 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', "${X11TOOLS}", "", d)} \
61 ${@base_contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \ 61 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', "${X11GLTOOLS}", "", d)} \
62 ${@base_contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \ 62 ${@bb.utils.contains('DISTRO_FEATURES', '3g', "${3GTOOLS}", "", d)} \
63 " 63 "