8 files changed, 72 insertions, 49 deletions

diff --git a/conf/distro/include/colibri-vf.conf b/conf/distro/include/colibri-vf.conf
index e1c5d55..db970fd 100644
--- a/conf/distro/include/colibri-vf.conf
+++ b/conf/distro/include/colibri-vf.conf
@@ -29,7 +29,11 @@
 
 include conf/distro/include/toradex.inc
 
-BBMASK .= "|meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex|meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb|meta-fsl-arm-extra/recipes-bsp/mqxboot"
+BBMASK += "\
+    meta-fsl-arm-extra/recipes-kernel/kernel-module-mcc-toradex \
+    meta-fsl-arm-extra/recipes-kernel/kernel-modules/kernel-module-mcc_2.1.01.bb \
+    meta-fsl-arm-extra/recipes-bsp/mqxboot \
+    "
 
 DEPLOY_CONF_NAME = "Toradex Colibri VF"
 
diff --git a/conf/distro/include/imx6.inc b/conf/distro/include/imx6.inc
index e686e85..25eb691 100644
--- a/conf/distro/include/imx6.inc
+++ b/conf/distro/include/imx6.inc
@@ -27,8 +27,7 @@
 ##
 ############################################################################
 
-BBMASK ?= " "
-BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 
diff --git a/conf/distro/include/nvidia-logan.conf b/conf/distro/include/nvidia-logan.conf
index 0f932c2..23c84c6 100644
--- a/conf/distro/include/nvidia-logan.conf
+++ b/conf/distro/include/nvidia-logan.conf
@@ -53,14 +53,13 @@ MACHINE_EXTRA_INSTALL_SDK = "\
 PREFERRED_PROVIDER_libdrm ?= "libdrm-nv"
 PREFERRED_PROVIDER_drm ?= "libdrm-nv"
 
-BBMASK ?= " "
-BBMASK .= "\
-|meta-vib3/recipes-kernel/linux-libc-headers\
-|meta-vib3/recipes-devtools/binutils\
-|meta-vib3/recipes-core/eglibc\
-|meta-vib3/recipes-core/systemd\
-|meta-vib3/recipes-connectivity\
-|meta-vib3/recipes-multimedia/pulseaudio\
-|meta-vib3/recipes-core/meta/external-tegra-toolchain.bb\
-|meta-vib3/recipes-core/packagegroups\
-"
+BBMASK += "\
+    meta-vib3/recipes-kernel/linux-libc-headers \
+    meta-vib3/recipes-devtools/binutils \
+    meta-vib3/recipes-core/eglibc \
+    meta-vib3/recipes-core/systemd \
+    meta-vib3/recipes-connectivity \
+    meta-vib3/recipes-multimedia/pulseaudio \
+    meta-vib3/recipes-core/meta/external-tegra-toolchain.bb \
+    meta-vib3/recipes-core/packagegroups \
+    "
diff --git a/conf/distro/include/rcar-gen2.inc b/conf/distro/include/rcar-gen2.inc
index a1768bc..c9bf0ae 100644
--- a/conf/distro/include/rcar-gen2.inc
+++ b/conf/distro/include/rcar-gen2.inc
@@ -117,18 +117,17 @@ MACHINE_EXTRA_INSTALL_append_lcb = " \
 "
 
 BB_MULTIMEDIA_TEST_MODULE = "\
-|fdpm-tp-user-module\
-|mmngr-tp-user-module\
-|mmngrbuf-tp-user-module\
-|s3ctl-tp-user-module\
-|vspm-tp-user-module\
-"
+    fdpm-tp-user-module \
+    mmngr-tp-user-module \
+    mmngrbuf-tp-user-module \
+    s3ctl-tp-user-module \
+    vspm-tp-user-module \
+    "
 
-BBMASK ?= " "
-BBMASK .= "\
-${BB_MULTIMEDIA_TEST_MODULE}\
-|dtv-module|ssp-module|scu-module\
-|gles-test-module\
-|poky/meta/recipes-graphics/mesa\
-|meta-fsl-arm/recipes-graphics/mesa\
-"
+BBMASK += "\
+    ${BB_MULTIMEDIA_TEST_MODULE} \
+    dtv-module ssp-module scu-module \
+    gles-test-module \
+    poky/meta/recipes-graphics/mesa \
+    meta-fsl-arm/recipes-graphics/mesa \
+    "
diff --git a/conf/distro/include/smarc-samx6i.conf b/conf/distro/include/smarc-samx6i.conf
index 95388b6..5695b1c 100644
--- a/conf/distro/include/smarc-samx6i.conf
+++ b/conf/distro/include/smarc-samx6i.conf
@@ -42,5 +42,4 @@ MACHINE_EXTRA_INSTALL = "\
 
 KERNEL_MODULE_AUTOLOAD += "mxc_v4l2_capture"
 
-BBMASK ?= " "
-BBMASK .= "|meta-smx6/recipes-qt"
+BBMASK += "meta-smx6/recipes-qt"
diff --git a/conf/distro/include/tegra-t18x.conf b/conf/distro/include/tegra-t18x.conf
index baf7f5c..189c4c9 100644
--- a/conf/distro/include/tegra-t18x.conf
+++ b/conf/distro/include/tegra-t18x.conf
@@ -62,18 +62,17 @@ PREFERRED_PROVIDER_wayland ?= "wayland-nv"
 PREFERRED_PROVIDER_wayland-native ?= "wayland-nv"
 PREFERRED_PROVIDER_nativesdk-wayland ?= "wayland-nv"
 
-BBMASK ?= " "
-BBMASK .= "\
-|meta-vib4/recipes-connectivity/connman\
-|meta-vib4/recipes-core/busybox\
-|meta-vib4/recipes-core/images\
-|meta-vib4/recipes-core/meta\
-|meta-vib4/recipes-core/packagegroups\
-|meta-vib4/recipes-core/systemd/systemd\
-|meta-vib4/recipes-devtools\
-|meta-vib4/recipes-extended\
-|meta-vib4/recipes-multimedia/audiomanager\
-|meta-vib4/recipes-core/glibc\
-|meta-vib4/recipes-support/lvm2\
-|meta-vib4/recipes-kernel/linux-libc-headers\
-"
+BBMASK += "\
+    meta-vib4/recipes-connectivity/connman \
+    meta-vib4/recipes-core/busybox \
+    meta-vib4/recipes-core/images \
+    meta-vib4/recipes-core/meta \
+    meta-vib4/recipes-core/packagegroups \
+    meta-vib4/recipes-core/systemd/systemd \
+    meta-vib4/recipes-devtools \
+    meta-vib4/recipes-extended \
+    meta-vib4/recipes-multimedia/audiomanager \
+    meta-vib4/recipes-core/glibc \
+    meta-vib4/recipes-support/lvm2 \
+    meta-vib4/recipes-kernel/linux-libc-headers \
+    "
diff --git a/conf/distro/include/ti.inc b/conf/distro/include/ti.inc
index a445dc2..2f0d6cb 100644
--- a/conf/distro/include/ti.inc
+++ b/conf/distro/include/ti.inc
@@ -27,8 +27,7 @@
 ##
 ############################################################################
 
-BBMASK ?= " "
-BBMASK .= "|meta-fsl-arm/qt5-layer/recipes-qt/qt5"
+BBMASK += "meta-fsl-arm/qt5-layer/recipes-qt/qt5"
 
 IMAGE_FSTYPES += "ext3 sdcard"
 IMAGE_CLASSES += "image_types_fsl"
diff --git a/conf/distro/include/toradex.inc b/conf/distro/include/toradex.inc
index 9408c73..54df01a 100644
--- a/conf/distro/include/toradex.inc
+++ b/conf/distro/include/toradex.inc
@@ -27,5 +27,30 @@
 ##
 ############################################################################
 
-BBMASK ?= " "
-BBMASK .= "|meta-toradex/recipes-mozilla|meta-toradex/recipes-browser|meta-toradex/recipes-lxde|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes/trdx-config|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes-qt|meta-toradex/recipes-core/psplash|meta-toradex/recipes-support/florence|meta-toradex/recipes-core/systemd|meta-toradex/recipes-efl|meta-toradex/recipes-core/dropbear|meta-toradex/recipes-support/icu|meta-toradex/recipes-support/i2c-tools|meta-toradex/recipes-benchmark|meta-toradex/recipes-core/udev|meta-toradex/recipes-support/gnutls|meta-toradex/recipes-graphics/gpu-viv-bin-mx6q|meta-toradex/recipes-multimedia/gstreamer|meta-toradex/recipes-fsl/packagegroups|meta-toradex/recipes-core/glibc|meta-toradex/recipes-sato/webkit|meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5|meta-toradex/recipes-bsp/binary-drivers/opencv4tegra"
+BBMASK += "\
+    meta-toradex/recipes-mozilla \
+    meta-toradex/recipes-browser \
+    meta-toradex/recipes-lxde \
+    meta-toradex/recipes-connectivity \
+    meta-toradex/recipes-gnome \
+    meta-toradex/recipes/trdx-config \
+    meta-toradex/recipes-multimedia/webm \
+    meta-toradex/recipes-qt \
+    meta-toradex/recipes-core/psplash \
+    meta-toradex/recipes-support/florence \
+    meta-toradex/recipes-core/systemd \
+    meta-toradex/recipes-efl \
+    meta-toradex/recipes-core/dropbear \
+    meta-toradex/recipes-support/icu \
+    meta-toradex/recipes-support/i2c-tools \
+    meta-toradex/recipes-benchmark \
+    meta-toradex/recipes-core/udev \
+    meta-toradex/recipes-support/gnutls \
+    meta-toradex/recipes-graphics/gpu-viv-bin-mx6q \
+    meta-toradex/recipes-multimedia/gstreamer \
+    meta-toradex/recipes-fsl/packagegroups \
+    meta-toradex/recipes-core/glibc \
+    meta-toradex/recipes-sato/webkit \
+    meta-toradex/recipes-bsp/binary-drivers/cudatoolkit6.5 \
+    meta-toradex/recipes-bsp/binary-drivers/opencv4tegra \
+    "