Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

meta-digi: global replace base_contains function 

This function is deprecated in favor of bb.utils.contains. The same
change has been done in other layers.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2016-06-21 11:15:28 +02:00
parent 7db92fc476
commit 1e16f6af66
10 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/conf/machine/include/ccardimx28.inc
View File

@ -15,7 +15,7 @@ UBOOT_SYMLINK = "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
# Wireless external module
WIRELESS_MODULE ?= ""
WIRELESS_MODULE_append = "${@base_contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
WIRELESS_MODULE_append = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'kernel-module-atheros', '', d)}"
# Firmware
MACHINE_FIRMWARE ?= ""

4
meta-digi-arm/conf/machine/include/ccimx6ul.inc
View File

@ -26,8 +26,8 @@ MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins"
MACHINE_FEATURES += "wifi bluetooth"
MACHINE_FIRMWARE_append = " ${@base_contains('MACHINE_FEATURES', 'bluetooth', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@base_contains('MACHINE_FEATURES', 'wifi', 'firmware-qualcomm-qca6564-wifi', '', d)}"
MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'firmware-qualcomm-qca6564-bt', '', d)}"
MACHINE_FIRMWARE_append = " ${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'firmware-qualcomm-qca6564-wifi', '', d)}"
KERNEL_IMAGETYPE = "zImage"
# FLASH parameters

12
meta-digi-arm/conf/machine/include/digi-defaults.inc
View File

@ -16,12 +16,12 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
#
# Help variables used in recipes
HAVE_WIFI = "${@base_contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
HAVE_EXT_ETH = "${@base_contains('MACHINE_FEATURES', 'ext-eth', '1', '', d)}"
HAVE_BT = "${@base_contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}"
HAVE_1WIRE = "${@base_contains('MACHINE_FEATURES', '1-wire', '1', '', d)}"
HAVE_GUI = "${@base_contains('DISTRO_FEATURES', 'x11', '1', '', d)}"
HAVE_EXAMPLE = "${@base_contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}"
HAVE_WIFI = "${@bb.utils.contains('MACHINE_FEATURES', 'wifi', '1', '', d)}"
HAVE_EXT_ETH = "${@bb.utils.contains('MACHINE_FEATURES', 'ext-eth', '1', '', d)}"
HAVE_BT = "${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', '1', '', d)}"
HAVE_1WIRE = "${@bb.utils.contains('MACHINE_FEATURES', '1-wire', '1', '', d)}"
HAVE_GUI = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '1', '', d)}"
HAVE_EXAMPLE = "${@bb.utils.contains('IMAGE_FEATURES', 'dey-examples', '1', '', d)}"
#
# Ethernet configuration used in recipes

2
meta-digi-dey/conf/distro/dey.conf
View File

@ -23,7 +23,7 @@ DISTRO_FEATURES ?= "${DISTRO_FEATURES_DEFAULT} ${DISTRO_FEATURES_LIBC} ${POKY_DE
# 'ptest' -> fails to build QT5 toolchain
POKY_DEFAULT_DISTRO_FEATURES_remove = "ptest wayland"
GRAPHICAL_BACKEND = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}"
GRAPHICAL_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'fb', d)}"
# DEY image features (alphabetical order)
FEATURE_PACKAGES_dey-audio = "packagegroup-dey-audio"

4
meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-bluetooth.bb
View File

@ -12,6 +12,6 @@ inherit packagegroup
RDEPENDS_${PN} = " \
${BLUEZ} \
${BLUEZ}-testtools \
${@base_contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \
${@base_contains("BLUEZ", "bluez5", "bluez5-noinst-tools bluez5-obex", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "libasound-module-bluez", "", d)} \
${@bb.utils.contains("BLUEZ", "bluez5", "bluez5-noinst-tools bluez5-obex", "", d)} \
"

2
meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-network.bb
View File

@ -30,7 +30,7 @@ CELLULAR_PKGS = "\
RDEPENDS_${PN} = "\
iproute2 \
${@base_contains('DISTRO_FEATURES', 'cellular', '${CELLULAR_PKGS}', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'cellular', '${CELLULAR_PKGS}', '', d)} \
${VIRTUAL-RUNTIME_ftp-server} \
${VIRTUAL-RUNTIME_http-server} \
${VIRTUAL-RUNTIME_network-utils} \

10
meta-digi-dey/recipes-core/images/dey-image-qt.bb
View File

@ -19,11 +19,11 @@ IMAGE_FEATURES += " \
dey-qt \
package-management \
ssh-server-dropbear \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', '', d)} \
${@base_contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \
${@base_contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \
${@base_contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \
${@base_contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11-base x11-sato', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'accel-video', 'dey-gstreamer', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'alsa', 'dey-audio', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'bluetooth', 'dey-bluetooth', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'wifi', 'dey-wireless', '', d)} \
"
# SDK features (for toolchains generated from an image with populate_sdk)

2
meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
View File

@ -44,7 +44,7 @@ do_install_append() {
[ -z "${WLAN0_STATIC_NETMASK}" ] && sed -i -e "/##WLAN0_STATIC_NETMASK##/d" ${D}${sysconfdir}/network/interfaces
# Cellular interface
if [ -n "${@base_contains('DISTRO_FEATURES', 'cellular', '1', '', d)}" ] && [ -n "${CELLULAR_INTERFACE}" ]; then
if [ -n "${@bb.utils.contains('DISTRO_FEATURES', 'cellular', '1', '', d)}" ] && [ -n "${CELLULAR_INTERFACE}" ]; then
cat ${WORKDIR}/interfaces.cellular >> ${D}${sysconfdir}/network/interfaces
sed -i -e 's,##CELLULAR_INTERFACE##,${CELLULAR_INTERFACE},g' ${D}${sysconfdir}/network/interfaces
[ -n "${CELLULAR_AUTO}" ] && sed -i -e 's/#auto/auto/g' ${D}${sysconfdir}/network/interfaces

8
meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
View File

@ -24,7 +24,7 @@ VIRTUAL-RUNTIME_login_manager ?= ""
VIRTUAL-RUNTIME_passwd_manager ?= "shadow"
# Set virtual runtimes depending on X11 feature
VIRTUAL-RUNTIME_touchscreen ?= "${@base_contains('DISTRO_FEATURES', 'x11', '', 'tslib-calibrate tslib-tests', d)}"
VIRTUAL-RUNTIME_touchscreen ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'tslib-calibrate tslib-tests', d)}"
RDEPENDS_${PN} = "\
base-files \
@ -32,9 +32,9 @@ RDEPENDS_${PN} = "\
busybox \
busybox-acpid \
busybox-static-nodes \
${@base_contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
${@base_contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
${@base_contains("MACHINE_FEATURES", "touchscreen", "${VIRTUAL-RUNTIME_touchscreen}", "",d)} \
${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "rtc", "busybox-hwclock", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "${VIRTUAL-RUNTIME_touchscreen}", "",d)} \
init-ifupdown \
modutils-initscripts \
netbase \

26
meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
View File

@ -11,35 +11,35 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
inherit packagegroup
RDEPENDS_${PN} = "\
${@base_contains("MACHINE_FEATURES", "alsa", "dey-examples-alsa", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "alsa", "dey-examples-alsa", "", d)} \
dey-examples-gpio-sysfs \
${@base_contains("MACHINE_FEATURES", "rtc", "dey-examples-rtc", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "rtc", "dey-examples-rtc", "", d)} \
dey-examples-spidev \
${@base_contains("MACHINE_FEATURES", "alsa", "dey-examples-vplay", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "alsa", "dey-examples-vplay", "", d)} \
dey-examples-watchdog \
"
RDEPENDS_${PN}_append_ccardimx28 = "\
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
dey-examples-can \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
"
RDEPENDS_${PN}_append_ccimx6 = "\
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
dey-examples-can \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
${@base_contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "accel-graphics", "dey-examples-opengles", "", d)} \
dey-examples-v4l2 \
"
RDEPENDS_${PN}_append_ccimx6ul = "\
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-bt", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-btconfig", "", d)} \
dey-examples-can \
${@base_contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
${@bb.utils.contains("MACHINE_FEATURES", "bluetooth", "dey-examples-hdp", "", d)} \
"
COMPATIBLE_MACHINE = "(ccardimx28|ccimx6$|ccimx6ul)"