diff options
7 files changed, 11 insertions, 11 deletions
diff --git a/common/conf/machine/include/amd-multimedia.inc b/common/conf/machine/include/amd-multimedia.inc index c45f1bd2..0d5a2746 100644 --- a/common/conf/machine/include/amd-multimedia.inc +++ b/common/conf/machine/include/amd-multimedia.inc @@ -5,4 +5,4 @@ GST_PACKAGES = " \ gstreamer1.0-meta-video \ gstreamer1.0-omx \ " -IMAGE_INSTALL_append_mel += " ${@base_contains("DISTRO", "mel", "${GST_PACKAGES}", "", d)}" +IMAGE_INSTALL_append_mel += " ${@bb.utils.contains("DISTRO", "mel", "${GST_PACKAGES}", "", d)}" diff --git a/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend index ab396c86..4f47e708 100644 --- a/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend +++ b/common/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend @@ -1,7 +1,7 @@ RRECOMMENDS_${PN}_remove_amd := " \ - ${@base_contains("DISTRO", "mel", "", "perf kernel-module-oprofile", d)} \ + ${@bb.utils.contains("DISTRO", "mel", "", "perf kernel-module-oprofile", d)} \ " PROFILETOOLS_remove_amd := " \ - ${@base_contains("DISTRO", "mel", "", "oprofile oprofileui-server", d)} \ + ${@bb.utils.contains("DISTRO", "mel", "", "oprofile oprofileui-server", d)} \ " diff --git a/common/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend b/common/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend index 3e640781..c2d1cc56 100644 --- a/common/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend +++ b/common/recipes-core/packagegroups/packagegroup-core-tools-testapps.bbappend @@ -1,10 +1,10 @@ RDEPENDS_${PN}_remove_amd = " \ gst-meta-video \ gst-meta-audio \ - ${@base_contains("DISTRO", "mel", "", "owl-video", d)} \ + ${@bb.utils.contains("DISTRO", "mel", "", "owl-video", d)} \ " -RDEPENDS_${PN}_append_amd = "${@base_contains("DISTRO", "mel", " \ +RDEPENDS_${PN}_append_amd = "${@bb.utils.contains("DISTRO", "mel", " \ gstreamer1.0-meta-video \ gstreamer1.0-meta-audio \ ", "", d)}" diff --git a/common/recipes-kernel/linux/linux-amd_3.12.34.bb b/common/recipes-kernel/linux/linux-amd_3.12.34.bb index a6e12984..4afeea8e 100644 --- a/common/recipes-kernel/linux/linux-amd_3.12.34.bb +++ b/common/recipes-kernel/linux/linux-amd_3.12.34.bb @@ -75,10 +75,10 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v3.x/linux-${PV}.tar.xz;name= file://logitech.cfg \ file://efi-partition.cfg \ file://sound.cfg \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "file://bluetooth.cfg", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "file://bluetooth.cfg", "", d)} \ file://disable-debug-preempt.cfg \ - ${@base_contains("MACHINE_EXTRA_RRECOMMENDS", "v86d", "file://uvesa.cfg", "", d)} \ - ${@base_contains("DISTRO", "mel", "", "file://disable-kgdb.cfg", d)} \ + ${@bb.utils.contains("MACHINE_EXTRA_RRECOMMENDS", "v86d", "file://uvesa.cfg", "", d)} \ + ${@bb.utils.contains("DISTRO", "mel", "", "file://disable-kgdb.cfg", d)} \ file://disable-sata-pmp.cfg \ file://usb-serial.cfg \ " diff --git a/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend b/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend index a7c669df..89249f53 100644 --- a/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend +++ b/common/recipes-sato/packagegroups/packagegroup-core-x11-sato.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-apps_remove := "${@base_contains("DISTRO", "mel", "", "gaku", d)}" +RDEPENDS_${PN}-apps_remove := "${@bb.utils.contains("DISTRO", "mel", "", "gaku", d)}" diff --git a/meta-baldeagle/conf/machine/baldeagle.conf b/meta-baldeagle/conf/machine/baldeagle.conf index a4c62106..f77a7882 100644 --- a/meta-baldeagle/conf/machine/baldeagle.conf +++ b/meta-baldeagle/conf/machine/baldeagle.conf @@ -19,7 +19,7 @@ require conf/machine/include/tune-baldeagle.inc MACHINE_FEATURES += "wifi efi pcbios" XSERVER_X86_RADEON = "xf86-video-ati \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-radeon', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-radeon', '', d)} \ " XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ diff --git a/meta-steppeeagle/conf/machine/steppeeagle.conf b/meta-steppeeagle/conf/machine/steppeeagle.conf index 85520528..a86e223b 100644 --- a/meta-steppeeagle/conf/machine/steppeeagle.conf +++ b/meta-steppeeagle/conf/machine/steppeeagle.conf @@ -19,7 +19,7 @@ require conf/machine/include/tune-steppeeagle.inc MACHINE_FEATURES += "wifi efi pcbios" XSERVER_X86_RADEON = "xf86-video-ati \ - ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-radeon', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-radeon', '', d)} \ " XSERVER ?= "${XSERVER_X86_BASE} \ ${XSERVER_X86_EXT} \ |