summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2014-04-24 18:59:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-25 16:19:19 (GMT)
commit4c14b094985216c433d330fb3d9532d4b6c91fcf (patch)
tree6970f383436ca29450779bd98c378aae89f2e079
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>
-rw-r--r--meta/classes/boot-directdisk.bbclass10
-rw-r--r--meta/classes/bootimg.bbclass8
-rw-r--r--meta/classes/buildhistory.bbclass8
-rw-r--r--meta/classes/core-image.bbclass4
-rw-r--r--meta/classes/image.bbclass20
-rw-r--r--meta/classes/packagegroup.bbclass2
-rw-r--r--meta/classes/ptest.bbclass4
-rw-r--r--meta/classes/rootfs_rpm.bbclass2
-rw-r--r--meta/conf/distro/include/default-providers.inc2
-rw-r--r--meta/conf/machine/include/qemu.inc2
-rw-r--r--meta/conf/machine/include/x86-base.inc6
-rw-r--r--meta/conf/machine/qemux86-64.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
-rw-r--r--meta/recipes-bsp/u-boot/u-boot.inc2
-rw-r--r--meta/recipes-connectivity/avahi/avahi.inc4
-rw-r--r--meta/recipes-connectivity/bind/bind_9.9.5.bb2
-rw-r--r--meta/recipes-connectivity/bluez/bluez4.inc4
-rw-r--r--meta/recipes-connectivity/bluez5/bluez5.inc4
-rw-r--r--meta/recipes-connectivity/connman/connman.inc30
-rw-r--r--meta/recipes-connectivity/libpcap/libpcap.inc2
-rw-r--r--meta/recipes-connectivity/neard/neard.inc8
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc6
-rw-r--r--meta/recipes-connectivity/openssh/openssh_6.5p1.bb10
-rw-r--r--meta/recipes-connectivity/openssl/openssl.inc4
-rw-r--r--meta/recipes-connectivity/portmap/portmap_6.0.bb2
-rw-r--r--meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb2
-rw-r--r--meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc2
-rw-r--r--meta/recipes-core/busybox/busybox.inc26
-rw-r--r--meta/recipes-core/coreutils/coreutils_6.9.bb2
-rw-r--r--meta/recipes-core/coreutils/coreutils_8.22.bb2
-rw-r--r--meta/recipes-core/dbus/dbus-ptest_1.6.18.bb2
-rw-r--r--meta/recipes-core/dbus/dbus.inc10
-rw-r--r--meta/recipes-core/dropbear/dropbear.inc8
-rw-r--r--meta/recipes-core/eglibc/eglibc-options.inc74
-rw-r--r--meta/recipes-core/eglibc/eglibc.inc2
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc4
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb4
-rw-r--r--meta/recipes-core/kbd/kbd_2.0.1.bb2
-rw-r--r--meta/recipes-core/libcgroup/libcgroup_0.41.bb4
-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
-rw-r--r--meta/recipes-core/systemd/systemd_211.bb8
-rw-r--r--meta/recipes-core/util-linux/util-linux.inc4
-rw-r--r--meta/recipes-devtools/binutils/binutils.inc6
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.12.2.bb2
-rw-r--r--meta/recipes-devtools/distcc/distcc_3.1.bb2
-rw-r--r--meta/recipes-devtools/dpkg/dpkg.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-configure-common.inc2
-rw-r--r--meta/recipes-devtools/gcc/gcc-cross-initial.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb-common.inc2
-rw-r--r--meta/recipes-devtools/gdb/gdb_7.6.2.bb2
-rw-r--r--meta/recipes-devtools/opkg/opkg.inc2
-rw-r--r--meta/recipes-devtools/patch/patch_2.7.1.bb2
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.3.bb2
-rw-r--r--meta/recipes-devtools/prelink/prelink_git.bb2
-rw-r--r--meta/recipes-devtools/python/python-imaging_1.1.7.bb4
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb12
-rw-r--r--meta/recipes-devtools/python/python.inc2
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc4
-rw-r--r--meta/recipes-devtools/strace/strace_4.8.bb2
-rw-r--r--meta/recipes-devtools/valgrind/valgrind_3.9.0.bb2
-rw-r--r--meta/recipes-extended/at/at_3.1.14.bb10
-rw-r--r--meta/recipes-extended/cronie/cronie_1.4.11.bb4
-rw-r--r--meta/recipes-extended/cups/cups.inc4
-rw-r--r--meta/recipes-extended/findutils/findutils_4.4.2.bb2
-rw-r--r--meta/recipes-extended/iptables/iptables_1.4.21.bb2
-rw-r--r--meta/recipes-extended/libarchive/libarchive_3.1.2.bb6
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb2
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb2
-rw-r--r--meta/recipes-extended/pam/libpam_1.1.6.bb4
-rw-r--r--meta/recipes-extended/screen/screen_4.0.3.bb8
-rw-r--r--meta/recipes-extended/shadow/shadow.inc4
-rw-r--r--meta/recipes-extended/shadow/shadow_4.1.4.3.bb2
-rw-r--r--meta/recipes-extended/sudo/sudo_1.8.9p5.bb10
-rw-r--r--meta/recipes-extended/sysklogd/sysklogd.inc2
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb4
-rw-r--r--meta/recipes-gnome/gnome/gconf_3.2.6.bb2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+.inc2
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc4
-rw-r--r--meta/recipes-graphics/cairo/cairo.inc4
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc4
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc4
-rw-r--r--meta/recipes-graphics/libsdl/libsdl_1.2.15.bb16
-rw-r--r--meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb16
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb4
-rw-r--r--meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb2
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc14
-rw-r--r--meta/recipes-graphics/mesa/mesa_9.2.5.bb4
-rw-r--r--meta/recipes-graphics/mesa/mesa_git.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb2
-rw-r--r--meta/recipes-graphics/pango/pango.inc2
-rw-r--r--meta/recipes-graphics/wayland/weston_1.4.0.bb8
-rw-r--r--meta/recipes-graphics/x11-common/xserver-nodm-init.bb4
-rw-r--r--meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc2
-rw-r--r--meta/recipes-kernel/kmod/kmod_git.bb2
-rw-r--r--meta/recipes-kernel/latencytop/latencytop_0.5.bb4
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc2
-rw-r--r--meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb4
-rw-r--r--meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc8
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc6
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc4
-rw-r--r--meta/recipes-multimedia/libav/libav.inc2
-rw-r--r--meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb2
-rw-r--r--meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb2
-rw-r--r--meta/recipes-multimedia/pulseaudio/pulseaudio.inc12
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb4
-rw-r--r--meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb2
-rw-r--r--meta/recipes-qt/qt4/qt-mobility_1.2.0.inc8
-rw-r--r--meta/recipes-qt/qt4/qt4-x11-free.inc2
-rw-r--r--meta/recipes-qt/qt4/qt4.inc4
-rw-r--r--meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb2
-rw-r--r--meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb8
-rw-r--r--meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb2
-rw-r--r--meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb4
-rw-r--r--meta/recipes-support/boost/boost.inc2
-rw-r--r--meta/recipes-support/consolekit/consolekit_0.4.6.bb6
-rw-r--r--meta/recipes-support/libcap/libcap.inc4
-rw-r--r--meta/recipes-support/libproxy/libproxy_0.4.11.bb2
131 files changed, 391 insertions, 391 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 88e5c52..0da9932 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -31,17 +31,17 @@ EXCLUDE_FROM_WORLD = "1"
31BOOTDD_VOLUME_ID ?= "boot" 31BOOTDD_VOLUME_ID ?= "boot"
32BOOTDD_EXTRA_SPACE ?= "16384" 32BOOTDD_EXTRA_SPACE ?= "16384"
33 33
34EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" 34EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
35EFI_PROVIDER ?= "grub-efi" 35EFI_PROVIDER ?= "grub-efi"
36EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" 36EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
37 37
38# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 38# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
39# contain "efi". This way legacy is supported by default if neither is 39# contain "efi". This way legacy is supported by default if neither is
40# specified, maintaining the original behavior. 40# specified, maintaining the original behavior.
41def pcbios(d): 41def pcbios(d):
42 pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) 42 pcbios = bb.utils.contains("MACHINE_FEATURES", "pcbios", "1", "0", d)
43 if pcbios == "0": 43 if pcbios == "0":
44 pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) 44 pcbios = bb.utils.contains("MACHINE_FEATURES", "efi", "0", "1", d)
45 return pcbios 45 return pcbios
46 46
47def pcbios_class(d): 47def pcbios_class(d):
@@ -62,7 +62,7 @@ DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}"
62SYSLINUX_ROOT ?= "root=/dev/sda2" 62SYSLINUX_ROOT ?= "root=/dev/sda2"
63SYSLINUX_TIMEOUT ?= "10" 63SYSLINUX_TIMEOUT ?= "10"
64 64
65IS_VMDK = '${@base_contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}' 65IS_VMDK = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "true", "false", d)}'
66 66
67boot_direct_populate() { 67boot_direct_populate() {
68 dest=$1 68 dest=$1
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index b13eef9..7678567 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -41,17 +41,17 @@ COMPRESSISO ?= "0"
41BOOTIMG_VOLUME_ID ?= "boot" 41BOOTIMG_VOLUME_ID ?= "boot"
42BOOTIMG_EXTRA_SPACE ?= "512" 42BOOTIMG_EXTRA_SPACE ?= "512"
43 43
44EFI = "${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)}" 44EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}"
45EFI_PROVIDER ?= "grub-efi" 45EFI_PROVIDER ?= "grub-efi"
46EFI_CLASS = "${@base_contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" 46EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
47 47
48# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 48# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
49# contain "efi". This way legacy is supported by default if neither is 49# contain "efi". This way legacy is supported by default if neither is
50# specified, maintaining the original behavior. 50# specified, maintaining the original behavior.
51def pcbios(d): 51def pcbios(d):
52 pcbios = base_contains("MACHINE_FEATURES", "pcbios", "1", "0", d) 52 pcbios = bb.utils.contains("MACHINE_FEATURES", "pcbios", "1", "0", d)
53 if pcbios == "0": 53 if pcbios == "0":
54 pcbios = base_contains("MACHINE_FEATURES", "efi", "0", "1", d) 54 pcbios = bb.utils.contains("MACHINE_FEATURES", "efi", "0", "1", d)
55 return pcbios 55 return pcbios
56 56
57PCBIOS = "${@pcbios(d)}" 57PCBIOS = "${@pcbios(d)}"
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 262095f..d75e7e6 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -403,7 +403,7 @@ buildhistory_get_image_installed() {
403 # Anything requiring the use of the packaging system should be done in here 403 # Anything requiring the use of the packaging system should be done in here
404 # in case the packaging files are going to be removed for this image 404 # in case the packaging files are going to be removed for this image
405 405
406 if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then 406 if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
407 return 407 return
408 fi 408 fi
409 409
@@ -414,7 +414,7 @@ buildhistory_get_sdk_installed() {
414 # Anything requiring the use of the packaging system should be done in here 414 # Anything requiring the use of the packaging system should be done in here
415 # in case the packaging files are going to be removed for this SDK 415 # in case the packaging files are going to be removed for this SDK
416 416
417 if [ "${@base_contains('BUILDHISTORY_FEATURES', 'sdk', '1', '0', d)}" = "0" ] ; then 417 if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'sdk', '1', '0', d)}" = "0" ] ; then
418 return 418 return
419 fi 419 fi
420 420
@@ -437,7 +437,7 @@ buildhistory_list_files() {
437 437
438 438
439buildhistory_get_imageinfo() { 439buildhistory_get_imageinfo() {
440 if [ "${@base_contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then 440 if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'image', '1', '0', d)}" = "0" ] ; then
441 return 441 return
442 fi 442 fi
443 443
@@ -469,7 +469,7 @@ END
469} 469}
470 470
471buildhistory_get_sdkinfo() { 471buildhistory_get_sdkinfo() {
472 if [ "${@base_contains('BUILDHISTORY_FEATURES', 'sdk', '1', '0', d)}" = "0" ] ; then 472 if [ "${@bb.utils.contains('BUILDHISTORY_FEATURES', 'sdk', '1', '0', d)}" = "0" ] ; then
473 return 473 return
474 fi 474 fi
475 475
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index 7475d7d..1b36cba 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -73,7 +73,7 @@ inherit image
73ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; " 73ROOTFS_POSTPROCESS_COMMAND += "rootfs_update_timestamp ; "
74 74
75# Zap the root password if debug-tweaks feature is not enabled 75# Zap the root password if debug-tweaks feature is not enabled
76ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_empty_root_password ; ",d)}' 76ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "", "zap_empty_root_password ; ",d)}'
77 77
78# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled 78# Tweak the mount options for rootfs in /etc/fstab if read-only-rootfs is enabled
79ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}' 79ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "read_only_rootfs_hook; ", "",d)}'
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 79de5a2..ceee848 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -25,7 +25,7 @@ IMAGE_FEATURES[type] = "list"
25IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs" 25IMAGE_FEATURES[validitems] += "debug-tweaks read-only-rootfs"
26 26
27# rootfs bootstrap install 27# rootfs bootstrap install
28ROOTFS_BOOTSTRAP_INSTALL = "${@base_contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}" 28ROOTFS_BOOTSTRAP_INSTALL = "${@bb.utils.contains("IMAGE_FEATURES", "package-management", "", "${ROOTFS_PKGMANAGE_BOOTSTRAP}",d)}"
29 29
30# packages to install from features 30# packages to install from features
31FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}" 31FEATURE_INSTALL = "${@' '.join(oe.packagegroup.required_packages(oe.data.typed_value('IMAGE_FEATURES', d), d))}"
@@ -79,9 +79,9 @@ do_rootfs[vardeps] += "BAD_RECOMMENDATIONS NO_RECOMMENDATIONS"
79do_build[depends] += "virtual/kernel:do_deploy" 79do_build[depends] += "virtual/kernel:do_deploy"
80 80
81def build_live(d): 81def build_live(d):
82 if base_contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg 82 if bb.utils.contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg
83 d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d)) 83 d.setVar('NOISO', bb.utils.contains('IMAGE_FSTYPES', "iso", "0", "1", d))
84 d.setVar('NOHDD', base_contains('IMAGE_FSTYPES', "hddimg", "0", "1", d)) 84 d.setVar('NOHDD', bb.utils.contains('IMAGE_FSTYPES', "hddimg", "0", "1", d))
85 if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0": 85 if d.getVar('NOISO', True) == "0" or d.getVar('NOHDD', True) == "0":
86 return "image-live" 86 return "image-live"
87 return "" 87 return ""
@@ -90,7 +90,7 @@ def build_live(d):
90IMAGE_TYPE_live = "${@build_live(d)}" 90IMAGE_TYPE_live = "${@build_live(d)}"
91 91
92inherit ${IMAGE_TYPE_live} 92inherit ${IMAGE_TYPE_live}
93IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}' 93IMAGE_TYPE_vmdk = '${@bb.utils.contains("IMAGE_FSTYPES", "vmdk", "image-vmdk", "", d)}'
94inherit ${IMAGE_TYPE_vmdk} 94inherit ${IMAGE_TYPE_vmdk}
95 95
96python () { 96python () {
@@ -143,17 +143,17 @@ inherit ${IMAGE_CLASSES}
143IMAGE_POSTPROCESS_COMMAND ?= "" 143IMAGE_POSTPROCESS_COMMAND ?= ""
144MACHINE_POSTPROCESS_COMMAND ?= "" 144MACHINE_POSTPROCESS_COMMAND ?= ""
145# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled 145# Allow dropbear/openssh to accept logins from accounts with an empty password string if debug-tweaks is enabled
146ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}' 146ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "ssh_allow_empty_password; ", "",d)}'
147# Enable postinst logging if debug-tweaks is enabled 147# Enable postinst logging if debug-tweaks is enabled
148ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}' 148ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "postinst_enable_logging; ", "",d)}'
149# Write manifest 149# Write manifest
150IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest" 150IMAGE_MANIFEST = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.manifest"
151ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; " 151ROOTFS_POSTPROCESS_COMMAND =+ "write_image_manifest ; "
152# Set default postinst log file 152# Set default postinst log file
153POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log" 153POSTINST_LOGFILE ?= "${localstatedir}/log/postinstall.log"
154# Set default target for systemd images 154# Set default target for systemd images
155SYSTEMD_DEFAULT_TARGET ?= '${@base_contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}' 155SYSTEMD_DEFAULT_TARGET ?= '${@bb.utils.contains("IMAGE_FEATURES", "x11-base", "graphical.target", "multi-user.target", d)}'
156ROOTFS_POSTPROCESS_COMMAND += '${@base_contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; ", "", d)}' 156ROOTFS_POSTPROCESS_COMMAND += '${@bb.utils.contains("DISTRO_FEATURES", "systemd", "set_systemd_default_target; ", "", d)}'
157 157
158# some default locales 158# some default locales
159IMAGE_LINGUAS ?= "de-de fr-fr en-gb" 159IMAGE_LINGUAS ?= "de-de fr-fr en-gb"
@@ -173,7 +173,7 @@ do_rootfs[umask] = "022"
173# A hook function to support read-only-rootfs IMAGE_FEATURES 173# A hook function to support read-only-rootfs IMAGE_FEATURES
174# Currently, it only supports sysvinit system. 174# Currently, it only supports sysvinit system.
175read_only_rootfs_hook () { 175read_only_rootfs_hook () {
176 if ${@base_contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then 176 if ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "true", "false", d)}; then
177 # Tweak the mount option and fs_passno for rootfs in fstab 177 # Tweak the mount option and fs_passno for rootfs in fstab
178 sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab 178 sed -i -e '/^[#[:space:]]*\/dev\/root/{s/defaults/ro/;s/\([[:space:]]*[[:digit:]]\)\([[:space:]]*\)[[:digit:]]$/\1\20/}' ${IMAGE_ROOTFS}/etc/fstab
179 # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes 179 # Change the value of ROOTFS_READ_ONLY in /etc/default/rcS to yes
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
index 9bc9cc2..6606bc6 100644
--- a/meta/classes/packagegroup.bbclass
+++ b/meta/classes/packagegroup.bbclass
@@ -41,7 +41,7 @@ do_populate_sysroot[noexec] = "1"
41 41
42python () { 42python () {
43 initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True) 43 initman = d.getVar("VIRTUAL-RUNTIME_init_manager", True)
44 if initman and initman in ['sysvinit', 'systemd'] and not base_contains('DISTRO_FEATURES', initman, True, False, d): 44 if initman and initman in ['sysvinit', 'systemd'] and not bb.utils.contains('DISTRO_FEATURES', initman, True, False, d):
45 bb.fatal("Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (%s) matches the entries enabled in DISTRO_FEATURES" % initman) 45 bb.fatal("Please ensure that your setting of VIRTUAL-RUNTIME_init_manager (%s) matches the entries enabled in DISTRO_FEATURES" % initman)
46} 46}
47 47
diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index 5c5505d..c96e74f 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -6,14 +6,14 @@ PTEST_PATH ?= "${libdir}/${PN}/ptest"
6FILES_${PN}-ptest = "${PTEST_PATH}" 6FILES_${PN}-ptest = "${PTEST_PATH}"
7SECTION_${PN}-ptest = "devel" 7SECTION_${PN}-ptest = "devel"
8ALLOW_EMPTY_${PN}-ptest = "1" 8ALLOW_EMPTY_${PN}-ptest = "1"
9PTEST_ENABLED = "${@base_contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}" 9PTEST_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}"
10PTEST_ENABLED_class-native = "" 10PTEST_ENABLED_class-native = ""
11PTEST_ENABLED_class-nativesdk = "" 11PTEST_ENABLED_class-nativesdk = ""
12PTEST_ENABLED_class-cross-canadian = "" 12PTEST_ENABLED_class-cross-canadian = ""
13RDEPENDS_${PN}-ptest_class-native = "" 13RDEPENDS_${PN}-ptest_class-native = ""
14RDEPENDS_${PN}-ptest_class-nativesdk = "" 14RDEPENDS_${PN}-ptest_class-nativesdk = ""
15 15
16PACKAGES =+ "${@base_contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}" 16PACKAGES =+ "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '${PN}-ptest', '', d)}"
17 17
18do_configure_ptest() { 18do_configure_ptest() {
19 : 19 :
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index 4b02247..9e97d34 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -6,7 +6,7 @@ ROOTFS_PKGMANAGE = "rpm smartpm"
6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts" 6ROOTFS_PKGMANAGE_BOOTSTRAP = "run-postinsts"
7 7
8# Add 50Meg of extra space for Smart 8# Add 50Meg of extra space for Smart
9IMAGE_ROOTFS_EXTRA_SPACE_append = "${@base_contains("PACKAGE_INSTALL", "smartpm", " + 51200", "" ,d)}" 9IMAGE_ROOTFS_EXTRA_SPACE_append = "${@bb.utils.contains("PACKAGE_INSTALL", "smartpm", " + 51200", "" ,d)}"
10 10
11# Smart is python based, so be sure python-native is available to us. 11# Smart is python based, so be sure python-native is available to us.
12EXTRANATIVEPATH += "python-native" 12EXTRANATIVEPATH += "python-native"
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 419ffcd..a1167fd 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -39,7 +39,7 @@ PREFERRED_PROVIDER_nativesdk-opkg ?= "nativesdk-opkg"
39PREFERRED_PROVIDER_console-tools ?= "kbd" 39PREFERRED_PROVIDER_console-tools ?= "kbd"
40PREFERRED_PROVIDER_gzip-native ?= "pigz-native" 40PREFERRED_PROVIDER_gzip-native ?= "pigz-native"
41PREFERRED_PROVIDER_make ?= "make" 41PREFERRED_PROVIDER_make ?= "make"
42PREFERRED_PROVIDER_udev ?= "${@base_contains('DISTRO_FEATURES','systemd','systemd','udev',d)}" 42PREFERRED_PROVIDER_udev ?= "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','udev',d)}"
43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details 43# There are issues with runtime packages and PREFERRED_PROVIDER, see YOCTO #5044 for details
44# on this rather strange entry. 44# on this rather strange entry.
45PREFERRED_PROVIDER_bluez4 ?= "bluez4" 45PREFERRED_PROVIDER_bluez4 ?= "bluez4"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 591f6b4..a5fc88a 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -5,7 +5,7 @@ PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" 5PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
6 6
7XSERVER ?= "xserver-xorg \ 7XSERVER ?= "xserver-xorg \
8 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
9 xf86-input-evdev \ 9 xf86-input-evdev \
10 xf86-input-mouse \ 10 xf86-input-mouse \
11 xf86-video-fbdev \ 11 xf86-video-fbdev \
diff --git a/meta/conf/machine/include/x86-base.inc b/meta/conf/machine/include/x86-base.inc
index d6c4d60..f7c8a45 100644
--- a/meta/conf/machine/include/x86-base.inc
+++ b/meta/conf/machine/include/x86-base.inc
@@ -33,16 +33,16 @@ XSERVER_X86_BASE = "xserver-xorg \
33 " 33 "
34 34
35XSERVER_X86_EXT = " \ 35XSERVER_X86_EXT = " \
36 ${@base_contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'xserver-xorg-extension-glx', '', d)} \
37 xserver-xorg-module-libint10 \ 37 xserver-xorg-module-libint10 \
38 " 38 "
39 39
40XSERVER_X86_I915 = "xf86-video-intel \ 40XSERVER_X86_I915 = "xf86-video-intel \
41 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \ 41 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i915', '', d)} \
42 " 42 "
43 43
44XSERVER_X86_I965 = "xf86-video-intel \ 44XSERVER_X86_I965 = "xf86-video-intel \
45 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-i965', '', d)} \
46 " 46 "
47 47
48XSERVER_X86_VESA = "xf86-video-vesa" 48XSERVER_X86_VESA = "xf86-video-vesa"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 6533e56..642a2d9 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -16,7 +16,7 @@ KERNEL_IMAGETYPE = "bzImage"
16SERIAL_CONSOLE = "115200 ttyS0" 16SERIAL_CONSOLE = "115200 ttyS0"
17 17
18XSERVER = "xserver-xorg \ 18XSERVER = "xserver-xorg \
19 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
20 xf86-input-vmmouse \ 20 xf86-input-vmmouse \
21 xf86-input-keyboard \ 21 xf86-input-keyboard \
22 xf86-input-evdev \ 22 xf86-input-evdev \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 94ee573..ebc27db 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,7 +15,7 @@ KERNEL_IMAGETYPE = "bzImage"
15SERIAL_CONSOLE = "115200 ttyS0" 15SERIAL_CONSOLE = "115200 ttyS0"
16 16
17XSERVER = "xserver-xorg \ 17XSERVER = "xserver-xorg \
18 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 18 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
19 xf86-input-vmmouse \ 19 xf86-input-vmmouse \
20 xf86-input-keyboard \ 20 xf86-input-keyboard \
21 xf86-input-evdev \ 21 xf86-input-evdev \
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index f49bb5d..cb50949 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -29,7 +29,7 @@ SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
29SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}" 29SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
30 30
31do_compile () { 31do_compile () {
32 if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 32 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
33 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk 33 sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
34 fi 34 fi
35 35
diff --git a/meta/recipes-connectivity/avahi/avahi.inc b/meta/recipes-connectivity/avahi/avahi.inc
index 6f89441..3318f40 100644
--- a/meta/recipes-connectivity/avahi/avahi.inc
+++ b/meta/recipes-connectivity/avahi/avahi.inc
@@ -58,8 +58,8 @@ EXTRA_OECONF = "--disable-introspection \
58 " 58 "
59 59
60# The distro choice determines what init scripts are installed 60# The distro choice determines what init scripts are installed
61EXTRA_OECONF_SYSVINIT = "${@base_contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}" 61EXTRA_OECONF_SYSVINIT = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','--with-distro=debian','--with-distro=none',d)}"
62EXTRA_OECONF_SYSTEMD = "${@base_contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}" 62EXTRA_OECONF_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES','systemd','--with-systemdsystemunitdir=${systemd_unitdir}/system/','--without-systemdsystemunitdir',d)}"
63 63
64AVAHI_GTK ?= "--disable-gtk --disable-gtk3" 64AVAHI_GTK ?= "--disable-gtk --disable-gtk3"
65 65
diff --git a/meta/recipes-connectivity/bind/bind_9.9.5.bb b/meta/recipes-connectivity/bind/bind_9.9.5.bb
index 053c352..65ec232 100644
--- a/meta/recipes-connectivity/bind/bind_9.9.5.bb
+++ b/meta/recipes-connectivity/bind/bind_9.9.5.bb
@@ -21,7 +21,7 @@ SRC_URI[md5sum] = "e676c65cad5234617ee22f48e328c24e"
21SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1" 21SRC_URI[sha256sum] = "d4b64c1dde442145a316679acff2df4008aa117ae52dfa3a6bc69efecc7840d1"
22 22
23# --enable-exportlib is necessary for building dhcp 23# --enable-exportlib is necessary for building dhcp
24ENABLE_IPV6 = "--enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}" 24ENABLE_IPV6 = "--enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)}"
25EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \ 25EXTRA_OECONF = " ${ENABLE_IPV6} --with-randomdev=/dev/random --disable-threads \
26 --disable-devpoll --disable-epoll --with-gost=no \ 26 --disable-devpoll --disable-epoll --with-gost=no \
27 --with-gssapi=no --with-ecdsa=yes \ 27 --with-gssapi=no --with-ecdsa=yes \
diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc
index 0827005..321fddb 100644
--- a/meta/recipes-connectivity/bluez/bluez4.inc
+++ b/meta/recipes-connectivity/bluez/bluez4.inc
@@ -11,8 +11,8 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline libsndfile1"
11RDEPENDS_${PN}-dev = "bluez-hcidump" 11RDEPENDS_${PN}-dev = "bluez-hcidump"
12 12
13PACKAGECONFIG ??= "\ 13PACKAGECONFIG ??= "\
14 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\
15 ${@base_contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ 15 ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\
16" 16"
17PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 17PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
18PACKAGECONFIG[pie] = "--enable-pie,--disable-pie," 18PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,"
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index 2b832ef..fa6f08b 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -10,7 +10,7 @@ DEPENDS = "udev libusb dbus-glib glib-2.0 libcheck readline"
10 10
11RCONFLICTS_${PN} = "bluez4" 11RCONFLICTS_${PN} = "bluez4"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} obex-profiles"
14PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical" 14PACKAGECONFIG[obex-profiles] = "--enable-obex,--disable-obex,libical"
15 15
16SRC_URI = "\ 16SRC_URI = "\
@@ -26,7 +26,7 @@ EXTRA_OECONF = "\
26 --disable-cups \ 26 --disable-cups \
27 --enable-test \ 27 --enable-test \
28 --enable-datafiles \ 28 --enable-datafiles \
29 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--disable-systemd', d)} \
30 --enable-library \ 30 --enable-library \
31" 31"
32 32
diff --git a/meta/recipes-connectivity/connman/connman.inc b/meta/recipes-connectivity/connman/connman.inc
index 4bd94f3..f121a81 100644
--- a/meta/recipes-connectivity/connman/connman.inc
+++ b/meta/recipes-connectivity/connman/connman.inc
@@ -27,13 +27,13 @@ EXTRA_OECONF += "\
27 --enable-test \ 27 --enable-test \
28 --disable-polkit \ 28 --disable-polkit \
29 --enable-client \ 29 --enable-client \
30 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
31" 31"
32 32
33PACKAGECONFIG ??= "wispr \ 33PACKAGECONFIG ??= "wispr \
34 ${@base_contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \ 34 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wifi', '', d)} \
35 ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluetooth', '', d)} \
36 ${@base_contains('DISTRO_FEATURES', '3g','3g', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', '3g','3g', '', d)} \
37" 37"
38 38
39# If you want ConnMan to support VPN, add following statement into 39# If you want ConnMan to support VPN, add following statement into
@@ -81,7 +81,7 @@ do_compile_append() {
81} 81}
82 82
83do_install_append() { 83do_install_append() {
84 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 84 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
85 install -d ${D}${sysconfdir}/init.d 85 install -d ${D}${sysconfdir}/init.d
86 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman 86 install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
87 sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman 87 sed -i s%@LIBDIR@%${libdir}% ${D}${sysconfdir}/init.d/connman
@@ -106,16 +106,16 @@ do_install_append() {
106RPROVIDES_${PN} = "\ 106RPROVIDES_${PN} = "\
107 connman-plugin-loopback \ 107 connman-plugin-loopback \
108 connman-plugin-ethernet \ 108 connman-plugin-ethernet \
109 ${@base_contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \ 109 ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth','connman-plugin-bluetooth', '', d)} \
110 ${@base_contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \ 110 ${@bb.utils.contains('PACKAGECONFIG', 'wifi','connman-plugin-wifi', '', d)} \
111 ${@base_contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \ 111 ${@bb.utils.contains('PACKAGECONFIG', '3g','connman-plugin-ofono', '', d)} \
112 " 112 "
113 113
114RDEPENDS_${PN} = "\ 114RDEPENDS_${PN} = "\
115 dbus \ 115 dbus \
116 ${@base_contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \ 116 ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'bluez4', '', d)} \
117 ${@base_contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \ 117 ${@bb.utils.contains('PACKAGECONFIG', 'wifi','wpa-supplicant', '', d)} \
118 ${@base_contains('PACKAGECONFIG', '3g','ofono', '', d)} \ 118 ${@bb.utils.contains('PACKAGECONFIG', '3g','ofono', '', d)} \
119 xuser-account \ 119 xuser-account \
120 " 120 "
121 121
@@ -188,7 +188,7 @@ to create a VPN connection to OpenVPN server."
188FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \ 188FILES_${PN}-plugin-vpn-openvpn += "${libdir}/connman/scripts/openvpn-script \
189 ${libdir}/connman/plugins-vpn/openvpn.so" 189 ${libdir}/connman/plugins-vpn/openvpn.so"
190RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn" 190RDEPENDS_${PN}-plugin-vpn-openvpn += "${PN}-vpn"
191RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}" 191RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','openvpn','${PN}-plugin-vpn-openvpn', '', d)}"
192 192
193SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN" 193SUMMARY_${PN}-plugin-vpn-vpnc = "A vpnc plugin for ConnMan VPN"
194DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \ 194DESCRIPTION_${PN}-plugin-vpn-vpnc = "The ConnMan vpnc plugin uses vpnc client \
@@ -196,7 +196,7 @@ to create a VPN connection to Cisco3000 VPN Concentrator."
196FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \ 196FILES_${PN}-plugin-vpn-vpnc += "${libdir}/connman/scripts/openconnect-script \
197 ${libdir}/connman/plugins-vpn/vpnc.so" 197 ${libdir}/connman/plugins-vpn/vpnc.so"
198RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn" 198RDEPENDS_${PN}-plugin-vpn-vpnc += "${PN}-vpn"
199RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}" 199RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','vpnc','${PN}-plugin-vpn-vpnc', '', d)}"
200 200
201SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN" 201SUMMARY_${PN}-plugin-vpn-l2tp = "A L2TP plugin for ConnMan VPN"
202DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \ 202DESCRIPTION_${PN}-plugin-vpn-l2tp = "The ConnMan L2TP plugin uses xl2tpd daemon \
@@ -204,7 +204,7 @@ to create a VPN connection to L2TP server."
204FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \ 204FILES_${PN}-plugin-vpn-l2tp += "${libdir}/connman/scripts/libppp-plugin.so* \
205 ${libdir}/connman/plugins-vpn/l2tp.so" 205 ${libdir}/connman/plugins-vpn/l2tp.so"
206RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn" 206RDEPENDS_${PN}-plugin-vpn-l2tp += "${PN}-vpn"
207RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}" 207RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','l2tp','${PN}-plugin-vpn-l2tp', '', d)}"
208 208
209SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN" 209SUMMARY_${PN}-plugin-vpn-pptp = "A PPTP plugin for ConnMan VPN"
210DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \ 210DESCRIPTION_${PN}-plugin-vpn-pptp = "The ConnMan PPTP plugin uses pptp-linux client \
@@ -212,4 +212,4 @@ to create a VPN connection to PPTP server."
212FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \ 212FILES_${PN}-plugin-vpn-pptp += "${libdir}/connman/scripts/libppp-plugin.so* \
213 ${libdir}/connman/plugins-vpn/pptp.so" 213 ${libdir}/connman/plugins-vpn/pptp.so"
214RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn" 214RDEPENDS_${PN}-plugin-vpn-pptp += "${PN}-vpn"
215RRECOMMENDS_${PN} += "${@base_contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}" 215RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG','pptp','${PN}-plugin-vpn-pptp', '', d)}"
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index a984e05..177b70f 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1d4b0366557951c84a94fabe3529f867 \
10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9" 10 file://pcap.h;beginline=1;endline=34;md5=8d6cf7e17d5745010d633e30bc529ea9"
11DEPENDS = "flex-native bison-native libnl" 11DEPENDS = "flex-native bison-native libnl"
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4" 14PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb" 15PACKAGECONFIG[canusb] = "--enable-canusb,--enable-canusb=no,libusb"
16PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1" 16PACKAGECONFIG[libnl1] = "--with-libnl,--without-libnl,libnl1,libnl1"
diff --git a/meta/recipes-connectivity/neard/neard.inc b/meta/recipes-connectivity/neard/neard.inc
index 1dde1da..e714cad 100644
--- a/meta/recipes-connectivity/neard/neard.inc
+++ b/meta/recipes-connectivity/neard/neard.inc
@@ -19,14 +19,14 @@ do_install() {
19 19
20# This would copy neard start-stop shell and test scripts 20# This would copy neard start-stop shell and test scripts
21do_install_append() { 21do_install_append() {
22 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 22 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
23 install -d ${D}${sysconfdir}/init.d/ 23 install -d ${D}${sysconfdir}/init.d/
24 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \ 24 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.in \
25 > ${D}${sysconfdir}/init.d/neard 25 > ${D}${sysconfdir}/init.d/neard
26 chmod 0755 ${D}${sysconfdir}/init.d/neard 26 chmod 0755 ${D}${sysconfdir}/init.d/neard
27 fi 27 fi
28 28
29 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 29 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${systemd_unitdir}/system 30 install -d ${D}${systemd_unitdir}/system
31 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \ 31 sed "s:@installpath@:${libexecdir}:" ${WORKDIR}/neard.service.in \
32 > ${D}${systemd_unitdir}/system/neard.service 32 > ${D}${systemd_unitdir}/system/neard.service
@@ -47,8 +47,8 @@ RDEPENDS_${PN} = "dbus python python-dbus python-pygobject"
47 47
48# Bluez & Wifi are not mandatory except for handover 48# Bluez & Wifi are not mandatory except for handover
49RRECOMMENDS_${PN} = "\ 49RRECOMMENDS_${PN} = "\
50 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
51 ${@base_contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \ 51 ${@bb.utils.contains('DISTRO_FEATURES', 'wifi','wpa-supplicant', '', d)} \
52 " 52 "
53 53
54RDEPENDS_${PN}-tests = "python python-dbus python-pygobject" 54RDEPENDS_${PN}-tests = "python python-dbus python-pygobject"
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 3972e06..9f65f4f 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -7,14 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \
7 7
8inherit autotools pkgconfig update-rc.d systemd 8inherit autotools pkgconfig update-rc.d systemd
9 9
10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@base_contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}" 10DEPENDS = "dbus glib-2.0 udev mobile-broadband-provider-info ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','bluez4', '', d)}"
11 11
12INITSCRIPT_NAME = "ofono" 12INITSCRIPT_NAME = "ofono"
13INITSCRIPT_PARAMS = "defaults 22" 13INITSCRIPT_PARAMS = "defaults 22"
14 14
15EXTRA_OECONF += "\ 15EXTRA_OECONF += "\
16 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdunitdir=${systemd_unitdir}/system/', '--with-systemdunitdir=', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth','--enable-bluetooth', '--disable-bluetooth', d)} \
18 --enable-test \ 18 --enable-test \
19" 19"
20SYSTEMD_SERVICE_${PN} = "ofono.service" 20SYSTEMD_SERVICE_${PN} = "ofono.service"
diff --git a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
index 3b10164..b93b9ae 100644
--- a/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_6.5p1.bb
@@ -8,7 +8,7 @@ LICENSE = "BSD"
8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507" 8LIC_FILES_CHKSUM = "file://LICENCE;md5=e326045657e842541d3f35aada442507"
9 9
10DEPENDS = "zlib openssl" 10DEPENDS = "zlib openssl"
11DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12 12
13RPROVIDES_${PN}-ssh = "ssh" 13RPROVIDES_${PN}-ssh = "ssh"
14RPROVIDES_${PN}-sshd = "sshd" 14RPROVIDES_${PN}-sshd = "sshd"
@@ -23,7 +23,7 @@ SRC_URI = "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-${PV}.tar.
23 file://ssh_config \ 23 file://ssh_config \
24 file://init \ 24 file://init \
25 file://openssh-CVE-2011-4327.patch \ 25 file://openssh-CVE-2011-4327.patch \
26 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
27 file://sshd.socket \ 27 file://sshd.socket \
28 file://sshd@.service \ 28 file://sshd@.service \
29 file://sshdgenkeys.service \ 29 file://sshdgenkeys.service \
@@ -58,7 +58,7 @@ export LD = "${CC}"
58 58
59# login path is hardcoded in sshd 59# login path is hardcoded in sshd
60EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \ 60EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
61 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 61 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
62 --without-zlib-version-check \ 62 --without-zlib-version-check \
63 --with-privsep-path=/var/run/sshd \ 63 --with-privsep-path=/var/run/sshd \
64 --sysconfdir=${sysconfdir}/ssh \ 64 --sysconfdir=${sysconfdir}/ssh \
@@ -90,7 +90,7 @@ do_compile_append () {
90} 90}
91 91
92do_install_append () { 92do_install_append () {
93 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 93 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
94 install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd 94 install -D -m 0755 ${WORKDIR}/sshd ${D}${sysconfdir}/pam.d/sshd
95 sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config 95 sed -i -e 's:#UsePAM no:UsePAM yes:' ${WORKDIR}/sshd_config ${D}${sysconfdir}/ssh/sshd_config
96 fi 96 fi
@@ -138,7 +138,7 @@ FILES_${PN}-misc = "${bindir}/ssh* ${libexecdir}/ssh*"
138FILES_${PN}-keygen = "${bindir}/ssh-keygen" 138FILES_${PN}-keygen = "${bindir}/ssh-keygen"
139 139
140RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen" 140RDEPENDS_${PN} += "${PN}-scp ${PN}-ssh ${PN}-sshd ${PN}-keygen"
141RDEPENDS_${PN}-sshd += "${PN}-keygen ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}" 141RDEPENDS_${PN}-sshd += "${PN}-keygen ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-keyinit pam-plugin-loginuid', '', d)}"
142RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make" 142RDEPENDS_${PN}-ptest += "${PN}-sftp ${PN}-misc ${PN}-sftp-server make"
143 143
144CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config" 144CONFFILES_${PN}-sshd = "${sysconfdir}/ssh/sshd_config"
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index ee02fb7..229ec87 100644
--- a/meta/recipes-connectivity/openssl/openssl.inc
+++ b/meta/recipes-connectivity/openssl/openssl.inc
@@ -37,7 +37,7 @@ FILES_libcrypto = "${base_libdir}/libcrypto${SOLIBS}"
37FILES_libssl = "${libdir}/libssl.so.*" 37FILES_libssl = "${libdir}/libssl.so.*"
38FILES_${PN} =+ " ${libdir}/ssl/*" 38FILES_${PN} =+ " ${libdir}/ssl/*"
39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" 39FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash"
40RDEPENDS_${PN}-misc = "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" 40RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}"
41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}" 41FILES_${PN}-dev += "${base_libdir}/libcrypto${SOLIBSDEV}"
42 42
43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto 43# Add the openssl.cnf file to the openssl-conf package. Make the libcrypto
@@ -157,7 +157,7 @@ do_install () {
157 cp --dereference -R include/openssl ${D}${includedir} 157 cp --dereference -R include/openssl ${D}${includedir}
158 158
159 oe_multilib_header openssl/opensslconf.h 159 oe_multilib_header openssl/opensslconf.h
160 if [ "${@base_contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then 160 if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then
161 install -m 0755 ${S}/tools/c_rehash ${D}${bindir} 161 install -m 0755 ${S}/tools/c_rehash ${D}${bindir}
162 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash 162 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash
163 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl 163 sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl
diff --git a/meta/recipes-connectivity/portmap/portmap_6.0.bb b/meta/recipes-connectivity/portmap/portmap_6.0.bb
index 68dd796..b0a9454 100644
--- a/meta/recipes-connectivity/portmap/portmap_6.0.bb
+++ b/meta/recipes-connectivity/portmap/portmap_6.0.bb
@@ -17,7 +17,7 @@ PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers"
17 17
18CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS" 18CPPFLAGS += "-DFACILITY=LOG_DAEMON -DENABLE_DNS -DHOSTS_ACCESS"
19CFLAGS += "-Wall -Wstrict-prototypes -fPIC" 19CFLAGS += "-Wall -Wstrict-prototypes -fPIC"
20EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@base_contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'" 20EXTRA_OEMAKE += "'NO_TCP_WRAPPER=${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '', '1', d)}'"
21 21
22fakeroot do_install() { 22fakeroot do_install() {
23 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d 23 install -d ${D}${mandir}/man8/ ${D}${base_sbindir} ${D}${sysconfdir}/init.d
diff --git a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
index 5897e40..68bd515 100644
--- a/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
+++ b/meta/recipes-connectivity/resolvconf/resolvconf_1.74.bb
@@ -26,7 +26,7 @@ do_install () {
26 install -d ${D}${sysconfdir}/default/volatiles 26 install -d ${D}${sysconfdir}/default/volatiles
27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \ 27 echo "d root root 0755 ${localstatedir}/run/${BPN}/interface none" \
28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf 28 > ${D}${sysconfdir}/default/volatiles/99_resolvconf
29 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 29 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
30 install -d ${D}${sysconfdir}/tmpfiles.d 30 install -d ${D}${sysconfdir}/tmpfiles.d
31 echo "d /run/${BPN}/interface - - - -" \ 31 echo "d /run/${BPN}/interface - - - -" \
32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf 32 > ${D}${sysconfdir}/tmpfiles.d/resolvconf.conf
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
index 11e8287..6eb3d2d 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
@@ -73,7 +73,7 @@ do_install () {
73 install -d ${D}/${datadir}/dbus-1/system-services 73 install -d ${D}/${datadir}/dbus-1/system-services
74 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services 74 install -m 644 ${S}/wpa_supplicant/dbus/*.service ${D}/${datadir}/dbus-1/system-services
75 75
76 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 76 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
77 install -d ${D}/${systemd_unitdir}/system 77 install -d ${D}/${systemd_unitdir}/system
78 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system 78 install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
79 fi 79 fi
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index e59afe6..0c1969c 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -60,14 +60,14 @@ def busybox_cfg(feature, tokens, cnf, rem):
60# Map distro features to config settings 60# Map distro features to config settings
61def features_to_busybox_settings(d): 61def features_to_busybox_settings(d):
62 cnf, rem = ([], []) 62 cnf, rem = ([], [])
63 busybox_cfg(base_contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem) 63 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IPV6', cnf, rem)
64 busybox_cfg(base_contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_LFS', cnf, rem) 64 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_LFS', cnf, rem)
65 busybox_cfg(base_contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem) 65 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'largefile', True, False, d), 'CONFIG_FDISK_SUPPORT_LARGE_DISKS', cnf, rem)
66 busybox_cfg(base_contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem) 66 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'nls', True, False, d), 'CONFIG_LOCALE_SUPPORT', cnf, rem)
67 busybox_cfg(base_contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem) 67 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV4', cnf, rem)
68 busybox_cfg(base_contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem) 68 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d), 'CONFIG_FEATURE_IFUPDOWN_IPV6', cnf, rem)
69 busybox_cfg(base_contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem) 69 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'wifi', True, False, d), 'CONFIG_RFKILL', cnf, rem)
70 busybox_cfg(base_contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem) 70 busybox_cfg(bb.utils.contains('DISTRO_FEATURES', 'bluetooth', True, False, d), 'CONFIG_RFKILL', cnf, rem)
71 return "\n".join(cnf), "\n".join(rem) 71 return "\n".join(cnf), "\n".join(rem)
72 72
73# X, Y = ${@features_to_uclibc_settings(d)} 73# X, Y = ${@features_to_uclibc_settings(d)}
@@ -84,8 +84,8 @@ configmangle = '/CROSS_COMPILER_PREFIX/d; \
84 ' 84 '
85OE_FEATURES := "${@features_to_busybox_conf(d)}" 85OE_FEATURES := "${@features_to_busybox_conf(d)}"
86OE_DEL := "${@features_to_busybox_del(d)}" 86OE_DEL := "${@features_to_busybox_del(d)}"
87DO_IPv4 := "${@base_contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}" 87DO_IPv4 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}"
88DO_IPv6 := "${@base_contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}" 88DO_IPv6 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}"
89 89
90python () { 90python () {
91 if "${OE_DEL}": 91 if "${OE_DEL}":
@@ -270,7 +270,7 @@ do_install () {
270 fi 270 fi
271 fi 271 fi
272 272
273 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 273 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
274 install -d ${D}${systemd_unitdir}/system 274 install -d ${D}${systemd_unitdir}/system
275 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \ 275 sed 's,@base_sbindir@,${base_sbindir},g' < ${WORKDIR}/busybox-syslog.service.in \
276 > ${D}${systemd_unitdir}/system/busybox-syslog.service 276 > ${D}${systemd_unitdir}/system/busybox-syslog.service
@@ -286,7 +286,7 @@ do_install () {
286 fi 286 fi
287 287
288 # Remove the sysvinit specific configuration file for systemd systems to avoid confusion 288 # Remove the sysvinit specific configuration file for systemd systems to avoid confusion
289 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then 289 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'false', 'true', d)}; then
290 rm -f ${D}${sysconfdir}/syslog-startup.conf.${BPN} 290 rm -f ${D}${sysconfdir}/syslog-startup.conf.${BPN}
291 fi 291 fi
292} 292}
@@ -299,7 +299,7 @@ ALTERNATIVE_${PN}-syslog += "syslog-conf"
299ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" 299ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf"
300 300
301python () { 301python () {
302 if base_contains('DISTRO_FEATURES', 'sysvinit', True, False, d): 302 if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d):
303 pn = d.getVar('PN', True) 303 pn = d.getVar('PN', True)
304 d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init') 304 d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init')
305 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True))) 305 d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True)))
diff --git a/meta/recipes-core/coreutils/coreutils_6.9.bb b/meta/recipes-core/coreutils/coreutils_6.9.bb
index 338aae3..b924914 100644
--- a/meta/recipes-core/coreutils/coreutils_6.9.bb
+++ b/meta/recipes-core/coreutils/coreutils_6.9.bb
@@ -36,7 +36,7 @@ SRC_URI[sha256sum] = "89c2895ad157de50e53298b22d91db116ee4e1dd3fdf4019260254e2e3
36 36
37# acl is not a default feature 37# acl is not a default feature
38# 38#
39PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 39PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
40PACKAGECONFIG_class-native ??= "" 40PACKAGECONFIG_class-native ??= ""
41 41
42# with, without, depends, rdepends 42# with, without, depends, rdepends
diff --git a/meta/recipes-core/coreutils/coreutils_8.22.bb b/meta/recipes-core/coreutils/coreutils_8.22.bb
index ba3a0a0..8f37814 100644
--- a/meta/recipes-core/coreutils/coreutils_8.22.bb
+++ b/meta/recipes-core/coreutils/coreutils_8.22.bb
@@ -26,7 +26,7 @@ EXTRA_OECONF_class-target = "--enable-install-program=arch --libexecdir=${libdir
26 26
27# acl is not a default feature 27# acl is not a default feature
28# 28#
29PACKAGECONFIG_class-target ??= "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 29PACKAGECONFIG_class-target ??= "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
30PACKAGECONFIG_class-native ??= "" 30PACKAGECONFIG_class-native ??= ""
31 31
32# with, without, depends, rdepends 32# with, without, depends, rdepends
diff --git a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
index bc260de..9ea0f4d 100644
--- a/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
+++ b/meta/recipes-core/dbus/dbus-ptest_1.6.18.bb
@@ -27,7 +27,7 @@ FILESPATH = "${FILE_DIRNAME}/dbus"
27 27
28inherit autotools pkgconfig gettext ptest 28inherit autotools pkgconfig gettext ptest
29 29
30EXTRA_OECONF_X = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}" 30EXTRA_OECONF_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)}"
31EXTRA_OECONF_X_class-native = "--without-x" 31EXTRA_OECONF_X_class-native = "--without-x"
32 32
33EXTRA_OECONF = "--enable-tests \ 33EXTRA_OECONF = "--enable-tests \
diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc
index 8d348f8..44ee5a6 100644
--- a/meta/recipes-core/dbus/dbus.inc
+++ b/meta/recipes-core/dbus/dbus.inc
@@ -6,7 +6,7 @@ LICENSE = "AFL-2 | GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=10dded3b58148f3f1fd804b26354af3e \
7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c" 7 file://dbus/dbus.h;beginline=6;endline=20;md5=7755c9d7abccd5dbd25a6a974538bb3c"
8DEPENDS = "expat virtual/libintl" 8DEPENDS = "expat virtual/libintl"
9RDEPENDS_dbus = "${@base_contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}" 9RDEPENDS_dbus = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'dbus-ptest-ptest', '', d)}"
10RDEPENDS_dbus_class-native = "" 10RDEPENDS_dbus_class-native = ""
11RDEPENDS_dbus_class-nativesdk = "" 11RDEPENDS_dbus_class-nativesdk = ""
12 12
@@ -66,7 +66,7 @@ FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool"
66 66
67pkg_postinst_dbus() { 67pkg_postinst_dbus() {
68 # If both systemd and sysvinit are enabled, mask the dbus-1 init script 68 # If both systemd and sysvinit are enabled, mask the dbus-1 init script
69 if ${@base_contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then 69 if ${@bb.utils.contains('DISTRO_FEATURES','systemd sysvinit','true','false',d)}; then
70 if [ -n "$D" ]; then 70 if [ -n "$D" ]; then
71 OPTS="--root=$D" 71 OPTS="--root=$D"
72 fi 72 fi
@@ -85,8 +85,8 @@ EXTRA_OECONF = "--disable-tests \
85 --with-xml=expat \ 85 --with-xml=expat \
86 --disable-systemd" 86 --disable-systemd"
87 87
88PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 88PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
89 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 89 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
90PACKAGECONFIG_class-native = "" 90PACKAGECONFIG_class-native = ""
91PACKAGECONFIG_class-nativesdk = "" 91PACKAGECONFIG_class-nativesdk = ""
92 92
@@ -98,7 +98,7 @@ PACKAGECONFIG[x11] = "--with-x --enable-x11-autolaunch,--without-x --disable-x11
98do_install() { 98do_install() {
99 autotools_do_install 99 autotools_do_install
100 100
101 if ${@base_contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then 101 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
102 install -d ${D}${sysconfdir}/init.d 102 install -d ${D}${sysconfdir}/init.d
103 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh 103 sed 's:@bindir@:${bindir}:' < ${WORKDIR}/dbus-1.init >${WORKDIR}/dbus-1.init.sh
104 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1 104 install -m 0755 ${WORKDIR}/dbus-1.init.sh ${D}${sysconfdir}/init.d/dbus-1
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index 40ed9d2..5a7be49 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4d290ce0ac102c828dfc9ce836784688"
10DEPENDS = "zlib" 10DEPENDS = "zlib"
11RPROVIDES_${PN} = "ssh sshd" 11RPROVIDES_${PN} = "ssh sshd"
12 12
13DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 13DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
14 14
15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
16 file://0001-urandom-xauth-changes-to-options.h.patch \ 16 file://0001-urandom-xauth-changes-to-options.h.patch \
@@ -21,7 +21,7 @@ SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
21 file://dropbearkey.service \ 21 file://dropbearkey.service \
22 file://dropbear@.service \ 22 file://dropbear@.service \
23 file://dropbear.socket \ 23 file://dropbear.socket \
24 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} " 24 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} "
25 25
26PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \ 26PAM_SRC_URI = "file://0005-dropbear-enable-pam.patch \
27 file://0006-dropbear-configuration-file.patch \ 27 file://0006-dropbear-configuration-file.patch \
@@ -41,7 +41,7 @@ SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
41BINCOMMANDS = "dbclient ssh scp" 41BINCOMMANDS = "dbclient ssh scp"
42EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"' 42EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
43EXTRA_OECONF += "\ 43EXTRA_OECONF += "\
44 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 44 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
45CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\"" 45CFLAGS += "-DSFTPSERVER_PATH=\\"${libdir}/openssh/sftp-server\\""
46 46
47do_install() { 47do_install() {
@@ -66,7 +66,7 @@ do_install() {
66 -e 's,/usr/bin,${bindir},g' \ 66 -e 's,/usr/bin,${bindir},g' \
67 -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear 67 -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/dropbear
68 chmod 755 ${D}${sysconfdir}/init.d/dropbear 68 chmod 755 ${D}${sysconfdir}/init.d/dropbear
69 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 69 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
70 install -d ${D}${sysconfdir}/pam.d 70 install -d ${D}${sysconfdir}/pam.d
71 install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/ 71 install -m 0644 ${WORKDIR}/dropbear ${D}${sysconfdir}/pam.d/
72 fi 72 fi
diff --git a/meta/recipes-core/eglibc/eglibc-options.inc b/meta/recipes-core/eglibc/eglibc-options.inc
index 0432758..259e752 100644
--- a/meta/recipes-core/eglibc/eglibc-options.inc
+++ b/meta/recipes-core/eglibc/eglibc-options.inc
@@ -14,43 +14,43 @@ def eglibc_cfg(feature, tokens, cnf):
14def features_to_eglibc_settings(d): 14def features_to_eglibc_settings(d):
15 cnf = ([]) 15 cnf = ([])
16 16
17 ipv4 = base_contains('DISTRO_FEATURES', 'ipv4', True, False, d) 17 ipv4 = bb.utils.contains('DISTRO_FEATURES', 'ipv4', True, False, d)
18 ipv6 = base_contains('DISTRO_FEATURES', 'ipv6', True, False, d) 18 ipv6 = bb.utils.contains('DISTRO_FEATURES', 'ipv6', True, False, d)
19 libc_backtrace = base_contains('DISTRO_FEATURES', 'libc-backtrace', True, False, d) 19 libc_backtrace = bb.utils.contains('DISTRO_FEATURES', 'libc-backtrace', True, False, d)
20 libc_big_macros = base_contains('DISTRO_FEATURES', 'libc-big-macros', True, False, d) 20 libc_big_macros = bb.utils.contains('DISTRO_FEATURES', 'libc-big-macros', True, False, d)
21 libc_bsd = base_contains('DISTRO_FEATURES', 'libc-bsd', True, False, d) 21 libc_bsd = bb.utils.contains('DISTRO_FEATURES', 'libc-bsd', True, False, d)
22 libc_cxx_tests = base_contains('DISTRO_FEATURES', 'libc-cxx-tests', True, False, d) 22 libc_cxx_tests = bb.utils.contains('DISTRO_FEATURES', 'libc-cxx-tests', True, False, d)
23 libc_catgets = base_contains('DISTRO_FEATURES', 'libc-catgets', True, False, d) 23 libc_catgets = bb.utils.contains('DISTRO_FEATURES', 'libc-catgets', True, False, d)
24 libc_charsets = base_contains('DISTRO_FEATURES', 'libc-charsets', True, False, d) 24 libc_charsets = bb.utils.contains('DISTRO_FEATURES', 'libc-charsets', True, False, d)
25 libc_crypt = base_contains('DISTRO_FEATURES', 'libc-crypt', True, False, d) 25 libc_crypt = bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', True, False, d)
26 libc_crypt_ufc = base_contains('DISTRO_FEATURES', 'libc-crypt-ufc', True, False, d) 26 libc_crypt_ufc = bb.utils.contains('DISTRO_FEATURES', 'libc-crypt-ufc', True, False, d)
27 libc_db_aliases = base_contains('DISTRO_FEATURES', 'libc-db-aliases', True, False, d) 27 libc_db_aliases = bb.utils.contains('DISTRO_FEATURES', 'libc-db-aliases', True, False, d)
28 libc_envz = base_contains('DISTRO_FEATURES', 'libc-envz', True, False, d) 28 libc_envz = bb.utils.contains('DISTRO_FEATURES', 'libc-envz', True, False, d)
29 libc_fcvt = base_contains('DISTRO_FEATURES', 'libc-fcvt', True, False, d) 29 libc_fcvt = bb.utils.contains('DISTRO_FEATURES', 'libc-fcvt', True, False, d)
30 libc_fmtmsg = base_contains('DISTRO_FEATURES', 'libc-fmtmsg', True, False, d) 30 libc_fmtmsg = bb.utils.contains('DISTRO_FEATURES', 'libc-fmtmsg', True, False, d)
31 libc_fstab = base_contains('DISTRO_FEATURES', 'libc-fstab', True, False, d) 31 libc_fstab = bb.utils.contains('DISTRO_FEATURES', 'libc-fstab', True, False, d)
32 libc_ftraverse = base_contains('DISTRO_FEATURES', 'libc-ftraverse', True, False, d) 32 libc_ftraverse = bb.utils.contains('DISTRO_FEATURES', 'libc-ftraverse', True, False, d)
33 libc_getlogin = base_contains('DISTRO_FEATURES', 'libc-getlogin', True, False, d) 33 libc_getlogin = bb.utils.contains('DISTRO_FEATURES', 'libc-getlogin', True, False, d)
34 libc_idn = base_contains('DISTRO_FEATURES', 'libc-idn', True, False, d) 34 libc_idn = bb.utils.contains('DISTRO_FEATURES', 'libc-idn', True, False, d)
35 libc_inet_anl = base_contains('DISTRO_FEATURES', 'libc-inet-anl', True, False, d) 35 libc_inet_anl = bb.utils.contains('DISTRO_FEATURES', 'libc-inet-anl', True, False, d)
36 libc_libm = base_contains('DISTRO_FEATURES', 'libc-libm', True, False, d) 36 libc_libm = bb.utils.contains('DISTRO_FEATURES', 'libc-libm', True, False, d)
37 libc_locales = base_contains('DISTRO_FEATURES', 'libc-locales', True, False, d) 37 libc_locales = bb.utils.contains('DISTRO_FEATURES', 'libc-locales', True, False, d)
38 libc_locale_code = base_contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d) 38 libc_locale_code = bb.utils.contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d)
39 libc_memusage = base_contains('DISTRO_FEATURES', 'libc-memusage', True, False, d) 39 libc_memusage = bb.utils.contains('DISTRO_FEATURES', 'libc-memusage', True, False, d)
40 libc_nis = base_contains('DISTRO_FEATURES', 'libc-nis', True, False, d) 40 libc_nis = bb.utils.contains('DISTRO_FEATURES', 'libc-nis', True, False, d)
41 libc_nsswitch = base_contains('DISTRO_FEATURES', 'libc-nsswitch', True, False, d) 41 libc_nsswitch = bb.utils.contains('DISTRO_FEATURES', 'libc-nsswitch', True, False, d)
42 libc_rcmd = base_contains('DISTRO_FEATURES', 'libc-rcmd', True, False, d) 42 libc_rcmd = bb.utils.contains('DISTRO_FEATURES', 'libc-rcmd', True, False, d)
43 libc_rtld_debug = base_contains('DISTRO_FEATURES', 'libc-rtld-debug', True, False, d) 43 libc_rtld_debug = bb.utils.contains('DISTRO_FEATURES', 'libc-rtld-debug', True, False, d)
44 libc_spawn = base_contains('DISTRO_FEATURES', 'libc-spawn', True, False, d) 44 libc_spawn = bb.utils.contains('DISTRO_FEATURES', 'libc-spawn', True, False, d)
45 libc_streams = base_contains('DISTRO_FEATURES', 'libc-streams', True, False, d) 45 libc_streams = bb.utils.contains('DISTRO_FEATURES', 'libc-streams', True, False, d)
46 libc_sunrpc = base_contains('DISTRO_FEATURES', 'libc-sunrpc', True, False, d) 46 libc_sunrpc = bb.utils.contains('DISTRO_FEATURES', 'libc-sunrpc', True, False, d)
47 libc_utmp = base_contains('DISTRO_FEATURES', 'libc-utmp', True, False, d) 47 libc_utmp = bb.utils.contains('DISTRO_FEATURES', 'libc-utmp', True, False, d)
48 libc_utmpx = base_contains('DISTRO_FEATURES', 'libc-utmpx', True, False, d) 48 libc_utmpx = bb.utils.contains('DISTRO_FEATURES', 'libc-utmpx', True, False, d)
49 libc_wordexp = base_contains('DISTRO_FEATURES', 'libc-wordexp', True, False, d) 49 libc_wordexp = bb.utils.contains('DISTRO_FEATURES', 'libc-wordexp', True, False, d)
50 libc_posix_clang_wchar = base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', True, False, d) 50 libc_posix_clang_wchar = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', True, False, d)
51 libc_posix_regexp = base_contains('DISTRO_FEATURES', 'libc-posix-regexp', True, False, d) 51 libc_posix_regexp = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-regexp', True, False, d)
52 libc_posix_regexp_glibc = base_contains('DISTRO_FEATURES', 'libc-posix-regexp-glibc', True, False, d) 52 libc_posix_regexp_glibc = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-regexp-glibc', True, False, d)
53 libc_posix_wchar_io = base_contains('DISTRO_FEATURES', 'libc-posix-wchar-io', True, False, d) 53 libc_posix_wchar_io = bb.utils.contains('DISTRO_FEATURES', 'libc-posix-wchar-io', True, False, d)
54 54
55 # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code 55 # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
56 new_dep = True 56 new_dep = True
diff --git a/meta/recipes-core/eglibc/eglibc.inc b/meta/recipes-core/eglibc/eglibc.inc
index 04c5d9a..5008cf2 100644
--- a/meta/recipes-core/eglibc/eglibc.inc
+++ b/meta/recipes-core/eglibc/eglibc.inc
@@ -12,7 +12,7 @@ TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
12# entire image as -O0, we override it with -O2 here and give a note about it. 12# entire image as -O0, we override it with -O2 here and give a note about it.
13def get_optimization(d): 13def get_optimization(d):
14 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True) 14 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
15 if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": 15 if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
16 bb.note("eglibc can't be built with -O0, -O2 will be used instead.") 16 bb.note("eglibc can't be built with -O0, -O2 will be used instead.")
17 return selected_optimization.replace("-O0", "-O2") 17 return selected_optimization.replace("-O0", "-O2")
18 return selected_optimization 18 return selected_optimization
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index cb07665..4d27262 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -16,7 +16,7 @@ SECTION = "libs"
16BBCLASSEXTEND = "native nativesdk" 16BBCLASSEXTEND = "native nativesdk"
17 17
18DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib" 18DEPENDS = "glib-2.0-native virtual/libiconv libffi zlib"
19DEPENDS_append_class-target = "${@base_contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}" 19DEPENDS_append_class-target = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', ' dbus', '', d)}"
20DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native" 20DEPENDS_class-native = "pkgconfig-native gettext-native libffi-native zlib-native"
21DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native" 21DEPENDS_class-nativesdk = "nativesdk-libtool nativesdk-libffi nativesdk-zlib ${BPN}-native"
22 22
@@ -31,7 +31,7 @@ S = "${WORKDIR}/glib-${PV}"
31 31
32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man" 32CORECONF = "--disable-dtrace --disable-fam --disable-libelf --disable-systemtap --disable-man"
33 33
34PTEST_CONF = "${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}" 34PTEST_CONF = "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)}"
35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}" 35EXTRA_OECONF = "--enable-included-printf=no ${CORECONF} ${PTEST_CONF}"
36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux" 36EXTRA_OECONF_class-native = "${CORECONF} --disable-selinux"
37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu" 37EXTRA_OECONF_append_libc-uclibc = " --with-libiconv=gnu"
diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index e8a5b78..5e0d377 100644
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -41,7 +41,7 @@ KERNEL_VERSION = ""
41 41
42inherit update-alternatives 42inherit update-alternatives
43DEPENDS_append = " update-rc.d-native" 43DEPENDS_append = " update-rc.d-native"
44DEPENDS_append = " ${@base_contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}" 44DEPENDS_append = " ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd-systemctl-native','',d)}"
45 45
46PACKAGES =+ "${PN}-functions" 46PACKAGES =+ "${PN}-functions"
47RDEPENDS_${PN} = "${PN}-functions" 47RDEPENDS_${PN} = "${PN}-functions"
@@ -149,7 +149,7 @@ MASKED_SCRIPTS = " \
149 urandom" 149 urandom"
150 150
151pkg_postinst_${PN} () { 151pkg_postinst_${PN} () {
152 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 152 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
153 if [ -n "$D" ]; then 153 if [ -n "$D" ]; then
154 OPTS="--root=$D" 154 OPTS="--root=$D"
155 fi 155 fi
diff --git a/meta/recipes-core/kbd/kbd_2.0.1.bb b/meta/recipes-core/kbd/kbd_2.0.1.bb
index 998a2d3..265b906 100644
--- a/meta/recipes-core/kbd/kbd_2.0.1.bb
+++ b/meta/recipes-core/kbd/kbd_2.0.1.bb
@@ -17,7 +17,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/${BP}.tar.bz2 \
17SRC_URI[md5sum] = "f80b93a6abddb6cc2a3652daaf7562ba" 17SRC_URI[md5sum] = "f80b93a6abddb6cc2a3652daaf7562ba"
18SRC_URI[sha256sum] = "223d60bb6882323cca161aeb5965590768b2f590fd7cddbf27511ad0ba7a429e" 18SRC_URI[sha256sum] = "223d60bb6882323cca161aeb5965590768b2f590fd7cddbf27511ad0ba7a429e"
19 19
20PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 20PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
21PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam," 21PACKAGECONFIG[pam] = "--enable-vlock, --disable-vlock, libpam,"
22 22
23PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans" 23PACKAGES += "${PN}-consolefonts ${PN}-keymaps ${PN}-unimaps ${PN}-consoletrans"
diff --git a/meta/recipes-core/libcgroup/libcgroup_0.41.bb b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
index 76b0b58..69f8566 100644
--- a/meta/recipes-core/libcgroup/libcgroup_0.41.bb
+++ b/meta/recipes-core/libcgroup/libcgroup_0.41.bb
@@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
8 8
9inherit autotools pkgconfig 9inherit autotools pkgconfig
10 10
11DEPENDS = "bison-native flex-native ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS = "bison-native flex-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12 12
13SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2" 13SRC_URI = "${SOURCEFORGE_MIRROR}/project/libcg/${BPN}/v0.41/${BPN}-${PV}.tar.bz2"
14 14
15SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f" 15SRC_URI[md5sum] = "3dea9d50b8a5b73ff0bf1cdcb210f63f"
16SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51" 16SRC_URI[sha256sum] = "e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51"
17 17
18EXTRA_OECONF = "${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}" 18EXTRA_OECONF = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam-module-dir=${base_libdir}/security --enable-pam=yes', '--enable-pam=no', d)}"
19 19
20# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html 20# http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg21444.html
21PARALLEL_MAKE = "" 21PARALLEL_MAKE = ""
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index 368c318..16f3a51 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 1154bc0..c8bc362 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 80f3031..7832c89 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 952fbd0..c766754 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 "
diff --git a/meta/recipes-core/systemd/systemd_211.bb b/meta/recipes-core/systemd/systemd_211.bb
index 278de9f..ec595be 100644
--- a/meta/recipes-core/systemd/systemd_211.bb
+++ b/meta/recipes-core/systemd/systemd_211.bb
@@ -11,7 +11,7 @@ PROVIDES = "udev"
11PE = "1" 11PE = "1"
12 12
13DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux" 13DEPENDS = "kmod docbook-sgml-dtd-4.1-native intltool-native gperf-native acl readline dbus libcap libcgroup glib-2.0 qemu-native util-linux"
14DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 14DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15 15
16SECTION = "base/shell" 16SECTION = "base/shell"
17 17
@@ -71,7 +71,7 @@ rootlibexecdir = "${rootprefix}/lib"
71# The gtk+ tools should get built as a separate recipe e.g. systemd-tools 71# The gtk+ tools should get built as a separate recipe e.g. systemd-tools
72EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ 72EXTRA_OECONF = " --with-rootprefix=${rootprefix} \
73 --with-rootlibdir=${rootlibdir} \ 73 --with-rootlibdir=${rootlibdir} \
74 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ 74 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \
75 --enable-xz \ 75 --enable-xz \
76 --disable-manpages \ 76 --disable-manpages \
77 --disable-coredump \ 77 --disable-coredump \
@@ -117,7 +117,7 @@ do_install() {
117 117
118 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/ 118 install -m 0644 ${WORKDIR}/00-create-volatile.conf ${D}${sysconfdir}/tmpfiles.d/
119 119
120 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 120 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
121 install -d ${D}${sysconfdir}/init.d 121 install -d ${D}${sysconfdir}/init.d
122 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd 122 install -m 0755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/systemd-udevd
123 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd 123 sed -i s%@UDEVD@%${rootlibexecdir}/systemd/systemd-udevd% ${D}${sysconfdir}/init.d/systemd-udevd
@@ -235,7 +235,7 @@ FILES_${PN} = " ${base_bindir}/* \
235 /lib/udev/rules.d/71-seat.rules \ 235 /lib/udev/rules.d/71-seat.rules \
236 /lib/udev/rules.d/73-seat-late.rules \ 236 /lib/udev/rules.d/73-seat-late.rules \
237 /lib/udev/rules.d/99-systemd.rules \ 237 /lib/udev/rules.d/99-systemd.rules \
238 ${@base_contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \ 238 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${sysconfdir}/pam.d', '', d)} \
239 " 239 "
240 240
241FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/" 241FILES_${PN}-dbg += "${rootlibdir}/.debug ${systemd_unitdir}/.debug ${systemd_unitdir}/*/.debug ${base_libdir}/security/.debug/"
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index ad7aac7..c2a3cf7 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -50,8 +50,8 @@ SHARED_EXTRA_OECONF = "--disable-use-tty-group \
50 50
51EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}" 51EXTRA_OECONF = "${SHARED_EXTRA_OECONF} --libdir=${base_libdir}"
52 52
53PACKAGECONFIG_class-target ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 53PACKAGECONFIG_class-target ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
54 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} " 54 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} "
55PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam," 55PACKAGECONFIG[pam] = "--enable-su --enable-runuser,--disable-su --disable-runuser, libpam,"
56 56
57# Respect the systemd feature for uuidd 57# Respect the systemd feature for uuidd
diff --git a/meta/recipes-devtools/binutils/binutils.inc b/meta/recipes-devtools/binutils/binutils.inc
index 7f084b5..5ab2b92 100644
--- a/meta/recipes-devtools/binutils/binutils.inc
+++ b/meta/recipes-devtools/binutils/binutils.inc
@@ -41,7 +41,7 @@ USE_ALTERNATIVES_FOR = " \
41 gprof \ 41 gprof \
42 ld \ 42 ld \
43 ld.bfd \ 43 ld.bfd \
44 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld.gold dwp', '', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld.gold dwp', '', d)} \
45 nm \ 45 nm \
46 objcopy \ 46 objcopy \
47 objdump \ 47 objdump \
@@ -69,11 +69,11 @@ EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
69 --disable-werror \ 69 --disable-werror \
70 --enable-plugins \ 70 --enable-plugins \
71 ${LDGOLD} \ 71 ${LDGOLD} \
72 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}" 72 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
73 73
74LDGOLD_class-native = "" 74LDGOLD_class-native = ""
75LDGOLD_class-crosssdk = "" 75LDGOLD_class-crosssdk = ""
76LDGOLD ?= "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)}" 76LDGOLD ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default --enable-threads', '', d)}"
77 77
78# This is necessary due to a bug in the binutils Makefiles 78# This is necessary due to a bug in the binutils Makefiles
79# EXTRA_OEMAKE = "configure-build-libiberty all" 79# EXTRA_OEMAKE = "configure-build-libiberty all"
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.12.2.bb b/meta/recipes-devtools/cmake/cmake_2.8.12.2.bb
index 30ae61e..de2ac6b 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.12.2.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.12.2.bb
@@ -29,7 +29,7 @@ EXTRA_OECMAKE=" \
29 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ 29 -DCMAKE_USE_SYSTEM_LIBRARIES=1 \
30 -DKWSYS_CHAR_IS_SIGNED=1 \ 30 -DKWSYS_CHAR_IS_SIGNED=1 \
31 -DBUILD_CursesDialog=0 \ 31 -DBUILD_CursesDialog=0 \
32 ${@base_contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '-DKWSYS_LFS_WORKS=1', '-DKWSYS_LFS_DISABLE=1', d)} \
33" 33"
34 34
35FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}" 35FILES_${PN} += "${datadir}/cmake-${CMAKE_MAJOR_VERSION}"
diff --git a/meta/recipes-devtools/distcc/distcc_3.1.bb b/meta/recipes-devtools/distcc/distcc_3.1.bb
index c69643c..ad0e94f 100644
--- a/meta/recipes-devtools/distcc/distcc_3.1.bb
+++ b/meta/recipes-devtools/distcc/distcc_3.1.bb
@@ -10,7 +10,7 @@ DEPENDS = "avahi"
10GTKCONFIG = "gtk" 10GTKCONFIG = "gtk"
11GTKCONFIG_libc-uclibc = "" 11GTKCONFIG_libc-uclibc = ""
12 12
13PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} popt" 13PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${GTKCONFIG}', '', d)} popt"
14PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+" 14PACKAGECONFIG[gtk] = "--with-gtk,--without-gtk --without-gnome,gtk+"
15# use system popt by default 15# use system popt by default
16PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt" 16PACKAGECONFIG[popt] = "--without-included-popt,--with-included-popt,popt"
diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc
index ca44e98..929906d 100644
--- a/meta/recipes-devtools/dpkg/dpkg.inc
+++ b/meta/recipes-devtools/dpkg/dpkg.inc
@@ -53,7 +53,7 @@ do_install_append () {
53 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* 53 sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-*
54 fi 54 fi
55 55
56 if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then 56 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
57 install -d ${D}${systemd_unitdir}/system 57 install -d ${D}${systemd_unitdir}/system
58 install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/ 58 install -m 0644 ${WORKDIR}/dpkg-configure.service ${D}${systemd_unitdir}/system/
59 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 59 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index dc44cc9..3cc5efa 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -19,7 +19,7 @@ LANGUAGES ?= "c,c++${FORTRAN}${JAVA}"
19# when linking shared libraries further in the build like (gnutls) 19# when linking shared libraries further in the build like (gnutls)
20 20
21SPECIAL_ARCH_LIST = "powerpc" 21SPECIAL_ARCH_LIST = "powerpc"
22OPTSPACE = '${@base_contains("SPECIAL_ARCH_LIST", "${TARGET_ARCH}", "", "--enable-target-optspace",d)}' 22OPTSPACE = '${@bb.utils.contains("SPECIAL_ARCH_LIST", "${TARGET_ARCH}", "", "--enable-target-optspace",d)}'
23 23
24EXTRA_OECONF_BASE ?= "" 24EXTRA_OECONF_BASE ?= ""
25EXTRA_OECONF_PATHS ?= "" 25EXTRA_OECONF_PATHS ?= ""
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index 3870168..897e055 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -21,7 +21,7 @@ EXTRA_OECONF = "--with-newlib \
21 --with-sysroot=${STAGING_DIR_TARGET} \ 21 --with-sysroot=${STAGING_DIR_TARGET} \
22 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \ 22 --with-build-sysroot=${GCCCROSS_BUILDSYSROOT} \
23 ${EXTRA_OECONF_INITIAL} \ 23 ${EXTRA_OECONF_INITIAL} \
24 ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '--with-ld=${STAGING_BINDIR_TOOLCHAIN}/${TARGET_PREFIX}ld.bfd', '', d)} \
25 ${EXTRA_OECONF_FPU}" 25 ${EXTRA_OECONF_FPU}"
26 26
27EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} " 27EXTRA_OECONF += " --with-native-system-header-dir=${SYSTEMHEADERS} "
diff --git a/meta/recipes-devtools/gdb/gdb-common.inc b/meta/recipes-devtools/gdb/gdb-common.inc
index 211a574..60f03e7 100644
--- a/meta/recipes-devtools/gdb/gdb-common.inc
+++ b/meta/recipes-devtools/gdb/gdb-common.inc
@@ -40,7 +40,7 @@ EXTRA_OECONF = "--disable-gdbtk --disable-tui --disable-x --disable-werror \
40 --with-curses --disable-multilib --with-system-readline --disable-sim \ 40 --with-curses --disable-multilib --with-system-readline --disable-sim \
41 --without-lzma \ 41 --without-lzma \
42 ${GDBPROPREFIX} ${EXPAT} \ 42 ${GDBPROPREFIX} ${EXPAT} \
43 ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \ 43 ${@bb.utils.contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)} \
44 --disable-rpath \ 44 --disable-rpath \
45 " 45 "
46 46
diff --git a/meta/recipes-devtools/gdb/gdb_7.6.2.bb b/meta/recipes-devtools/gdb/gdb_7.6.2.bb
index e864471..c7ca26b 100644
--- a/meta/recipes-devtools/gdb/gdb_7.6.2.bb
+++ b/meta/recipes-devtools/gdb/gdb_7.6.2.bb
@@ -7,7 +7,7 @@ PACKAGECONFIG ??= ""
7PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" 7PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python"
8 8
9do_configure_prepend() { 9do_configure_prepend() {
10 if [ -n "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then 10 if [ -n "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then
11 cat > ${WORKDIR}/python << EOF 11 cat > ${WORKDIR}/python << EOF
12#!/bin/sh 12#!/bin/sh
13case "\$2" in 13case "\$2" in
diff --git a/meta/recipes-devtools/opkg/opkg.inc b/meta/recipes-devtools/opkg/opkg.inc
index 198e500..ba21d84 100644
--- a/meta/recipes-devtools/opkg/opkg.inc
+++ b/meta/recipes-devtools/opkg/opkg.inc
@@ -54,7 +54,7 @@ do_install_append() {
54 # We need to create the lock directory 54 # We need to create the lock directory
55 install -d ${D}${OPKGLIBDIR}/opkg 55 install -d ${D}${OPKGLIBDIR}/opkg
56 56
57 if ${@base_contains('DISTRO_FEATURES','sysvinit','false','true',d)};then 57 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','false','true',d)};then
58 install -d ${D}${systemd_unitdir}/system 58 install -d ${D}${systemd_unitdir}/system
59 install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/ 59 install -m 0644 ${WORKDIR}/opkg-configure.service ${D}${systemd_unitdir}/system/
60 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \ 60 sed -i -e 's,@BASE_BINDIR@,${base_bindir},g' \
diff --git a/meta/recipes-devtools/patch/patch_2.7.1.bb b/meta/recipes-devtools/patch/patch_2.7.1.bb
index 7d009fe..3db318a 100644
--- a/meta/recipes-devtools/patch/patch_2.7.1.bb
+++ b/meta/recipes-devtools/patch/patch_2.7.1.bb
@@ -9,6 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
9 9
10acpaths = "-I ${S}/m4 " 10acpaths = "-I ${S}/m4 "
11 11
12PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}" 12PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)}"
13PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr," 13PACKAGECONFIG[xattr] = "--enable-xattr,--disable-xattr,attr,"
14 14
diff --git a/meta/recipes-devtools/perl/perl_5.14.3.bb b/meta/recipes-devtools/perl/perl_5.14.3.bb
index 09a3f3b..c307b99 100644
--- a/meta/recipes-devtools/perl/perl_5.14.3.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.3.bb
@@ -144,7 +144,7 @@ do_configure() {
144 config.sh-${TARGET_ARCH}-${TARGET_OS} 144 config.sh-${TARGET_ARCH}-${TARGET_OS}
145 fi 145 fi
146 146
147 ${@base_contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)} 147 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'do_nolargefile', d)}
148 148
149 # Update some paths in the configuration 149 # Update some paths in the configuration
150 sed -i -e 's,@ARCH@-thread-multi,,g' \ 150 sed -i -e 's,@ARCH@-thread-multi,,g' \
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 9f6e315..3288822 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -63,7 +63,7 @@ pkg_postinst_prelink() {
63#!/bin/sh 63#!/bin/sh
64 64
65if [ "x$D" != "x" ]; then 65if [ "x$D" != "x" ]; then
66 ${@base_contains('USER_CLASSES', 'image-prelink', 'exit 0', 'exit 1', d)} 66 ${@bb.utils.contains('USER_CLASSES', 'image-prelink', 'exit 0', 'exit 1', d)}
67fi 67fi
68 68
69prelink -a 69prelink -a
diff --git a/meta/recipes-devtools/python/python-imaging_1.1.7.bb b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
index ed8cfcc..a678328 100644
--- a/meta/recipes-devtools/python/python-imaging_1.1.7.bb
+++ b/meta/recipes-devtools/python/python-imaging_1.1.7.bb
@@ -25,14 +25,14 @@ inherit distutils
25do_compile() { 25do_compile() {
26 export STAGING_LIBDIR=${STAGING_LIBDIR} 26 export STAGING_LIBDIR=${STAGING_LIBDIR}
27 export STAGING_INCDIR=${STAGING_INCDIR} 27 export STAGING_INCDIR=${STAGING_INCDIR}
28 export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} 28 export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
29 distutils_do_compile 29 distutils_do_compile
30} 30}
31 31
32do_install() { 32do_install() {
33 export STAGING_LIBDIR=${STAGING_LIBDIR} 33 export STAGING_LIBDIR=${STAGING_LIBDIR}
34 export STAGING_INCDIR=${STAGING_INCDIR} 34 export STAGING_INCDIR=${STAGING_INCDIR}
35 export LCMS_ENABLED=${@base_contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)} 35 export LCMS_ENABLED=${@bb.utils.contains('PACKAGECONFIG', 'lcms', 'True', 'False', d)}
36 distutils_do_install 36 distutils_do_install
37 install -d ${D}${datadir}/doc/${BPN}/html/ 37 install -d ${D}${datadir}/doc/${BPN}/html/
38 install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/ 38 install -m 0644 ${S}/README ${D}${datadir}/doc/${BPN}/
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index 464c5c5..0971579 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -85,16 +85,16 @@ do_install_append() {
85 # Disable zypper channel support 85 # Disable zypper channel support
86 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py* 86 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/zyppchannelsync.py*
87 87
88 if [ -z "${@base_contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then 88 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'rpm', 'rpm', '', d)}" ]; then
89 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py* 89 rm -f ${D}${libdir}/python*/site-packages/smart/plugins/rpmdir.py*
90 rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm 90 rm -rf ${D}${libdir}/python*/site-packages/smart/backends/rpm
91 fi 91 fi
92 92
93 if [ -z "${@base_contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then 93 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'qt4', 'qt4', '', d)}" ]; then
94 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4 94 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/qt4
95 fi 95 fi
96 96
97 if [ -z "${@base_contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then 97 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'gtk', '', d)}" ]; then
98 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk 98 rm -rf ${D}${libdir}/python*/site-packages/smart/interfaces/gtk
99 fi 99 fi
100} 100}
@@ -115,9 +115,9 @@ do_install_append_class-nativesdk() {
115} 115}
116 116
117PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \ 117PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc smartpm \
118 ${@base_contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \ 118 ${@bb.utils.contains('PACKAGECONFIG', 'rpm', '${PN}-backend-rpm', '', d)} \
119 ${@base_contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \ 119 ${@bb.utils.contains('PACKAGECONFIG', 'qt4', '${PN}-interface-qt4', '', d)} \
120 ${@base_contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \ 120 ${@bb.utils.contains('PACKAGECONFIG', 'gtk', '${PN}-interface-gtk', '', d)} \
121 ${PN}-interface-images ${PN}" 121 ${PN}-interface-images ${PN}"
122 122
123RDEPENDS_smartpm = "${PN}" 123RDEPENDS_smartpm = "${PN}"
diff --git a/meta/recipes-devtools/python/python.inc b/meta/recipes-devtools/python/python.inc
index 90079a2..19942ba 100644
--- a/meta/recipes-devtools/python/python.inc
+++ b/meta/recipes-devtools/python/python.inc
@@ -25,7 +25,7 @@ EXTRA_OECONF = "\
25 --without-cxx-main \ 25 --without-cxx-main \
26 --with-signal-module \ 26 --with-signal-module \
27 --enable-shared \ 27 --enable-shared \
28 --enable-ipv6=${@base_contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \ 28 --enable-ipv6=${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'yes', 'no', d)} \
29 ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \ 29 ac_cv_header_bluetooth_bluetooth_h=no ac_cv_header_bluetooth_h=no \
30 ${PYTHONLSBOPTS} \ 30 ${PYTHONLSBOPTS} \
31" 31"
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 7eef705..26b0c93 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -2,7 +2,7 @@ SUMMARY = "Fast open source processor emulator"
2HOMEPAGE = "http://qemu.org" 2HOMEPAGE = "http://qemu.org"
3LICENSE = "GPLv2 & LGPLv2.1" 3LICENSE = "GPLv2 & LGPLv2.1"
4DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \ 4DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \
5 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" 5 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
6DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" 6DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
7DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" 7DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
8RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl" 8RDEPENDS_${PN}_class-nativesdk = "nativesdk-libsdl"
@@ -38,7 +38,7 @@ do_configure_prepend_class-native() {
38} 38}
39 39
40do_configure_prepend_class-nativesdk() { 40do_configure_prepend_class-nativesdk() {
41 if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then 41 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then
42 # Undo the -lX11 added by linker-flags.patch 42 # Undo the -lX11 added by linker-flags.patch
43 sed -i 's/-lX11//g' Makefile.target 43 sed -i 's/-lX11//g' Makefile.target
44 fi 44 fi
diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb
index 2482745..71563d4 100644
--- a/meta/recipes-devtools/strace/strace_4.8.bb
+++ b/meta/recipes-devtools/strace/strace_4.8.bb
@@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "f492291f07a7c805c07a8395cce1ea054a6401ad414f4cc12185672215
17inherit autotools ptest 17inherit autotools ptest
18RDEPENDS_${PN}-ptest += "make" 18RDEPENDS_${PN}-ptest += "make"
19 19
20PACKAGECONFIG_class-target ?= "libaio ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 20PACKAGECONFIG_class-target ?= "libaio ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
21 21
22PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio" 22PACKAGECONFIG[libaio] = "--enable-aio,--disable-aio,libaio"
23PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 23PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
diff --git a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
index 163367c..3c6aa13 100644
--- a/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
+++ b/meta/recipes-devtools/valgrind/valgrind_3.9.0.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c46082167a314d785d012a244748d803 \
8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215" 8 file://COPYING.DOCS;md5=8fdeb5abdb235a08e76835f8f3260215"
9 9
10X11DEPENDS = "virtual/libx11" 10X11DEPENDS = "virtual/libx11"
11DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 11DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
12PR = "r8" 12PR = "r8"
13 13
14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \ 14SRC_URI = "http://www.valgrind.org/downloads/valgrind-${PV}.tar.bz2 \
diff --git a/meta/recipes-extended/at/at_3.1.14.bb b/meta/recipes-extended/at/at_3.1.14.bb
index 1b87d4a..68a24b8 100644
--- a/meta/recipes-extended/at/at_3.1.14.bb
+++ b/meta/recipes-extended/at/at_3.1.14.bb
@@ -5,10 +5,10 @@ SECTION = "base"
5LICENSE = "GPLv2+" 5LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" 6LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4"
7DEPENDS = "flex flex-native \ 7DEPENDS = "flex flex-native \
8 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 8 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9 9
10VIRTUAL-RUNTIME_initscripts ?= "initscripts" 10VIRTUAL-RUNTIME_initscripts ?= "initscripts"
11RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \ 11RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_DEPS}', '', d)} \
12 ${VIRTUAL-RUNTIME_initscripts} \ 12 ${VIRTUAL-RUNTIME_initscripts} \
13" 13"
14 14
@@ -24,7 +24,7 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/at/at_${PV}.orig.tar.gz \
24 file://file_replacement_with_gplv2.patch \ 24 file://file_replacement_with_gplv2.patch \
25 file://S99at \ 25 file://S99at \
26 file://atd.service \ 26 file://atd.service \
27 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 27 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
28 28
29PAM_SRC_URI = "file://pam.conf.patch \ 29PAM_SRC_URI = "file://pam.conf.patch \
30 file://configure-add-enable-pam.patch" 30 file://configure-add-enable-pam.patch"
@@ -37,7 +37,7 @@ EXTRA_OECONF += "ac_cv_path_SENDMAIL=/bin/true \
37 --with-daemon_groupname=root \ 37 --with-daemon_groupname=root \
38 --with-jobdir=/var/spool/at/jobs \ 38 --with-jobdir=/var/spool/at/jobs \
39 --with-atspool=/var/spool/at/spool \ 39 --with-atspool=/var/spool/at/spool \
40 ac_cv_header_security_pam_appl_h=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} " 40 ac_cv_header_security_pam_appl_h=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} "
41 41
42inherit autotools-brokensep systemd 42inherit autotools-brokensep systemd
43 43
@@ -62,7 +62,7 @@ do_install () {
62 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system 62 install -m 0644 ${WORKDIR}/atd.service ${D}${systemd_unitdir}/system
63 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service 63 sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_unitdir}/system/atd.service
64 64
65 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 65 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
66 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd 66 install -D -m 0644 ${WORKDIR}/${BP}/pam.conf ${D}${sysconfdir}/pam.d/atd
67 fi 67 fi
68} 68}
diff --git a/meta/recipes-extended/cronie/cronie_1.4.11.bb b/meta/recipes-extended/cronie/cronie_1.4.11.bb
index 2a932e0..02234f6 100644
--- a/meta/recipes-extended/cronie/cronie_1.4.11.bb
+++ b/meta/recipes-extended/cronie/cronie_1.4.11.bb
@@ -20,7 +20,7 @@ SRC_URI = "https://fedorahosted.org/releases/c/r/cronie/cronie-${PV}.tar.gz \
20 file://crond.init \ 20 file://crond.init \
21 file://crontab \ 21 file://crontab \
22 file://crond.service \ 22 file://crond.service \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 23 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
24 24
25PAM_SRC_URI = "file://crond_pam_config.patch" 25PAM_SRC_URI = "file://crond_pam_config.patch"
26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid" 26PAM_DEPS = "libpam libpam-runtime pam-plugin-access pam-plugin-loginuid"
@@ -31,7 +31,7 @@ SRC_URI[sha256sum] = "fd08084cedddbb42499f80ddb7f2158195c3555c2ff40ee11d4ece2f98
31inherit autotools update-rc.d useradd systemd 31inherit autotools update-rc.d useradd systemd
32 32
33 33
34PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 34PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
35 35
36PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit," 36PACKAGECONFIG[audit] = "--with-audit,--without-audit,audit,"
37PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}" 37PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,${PAM_DEPS}"
diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc
index e4771f7..fd88552 100644
--- a/meta/recipes-extended/cups/cups.inc
+++ b/meta/recipes-extended/cups/cups.inc
@@ -14,8 +14,8 @@ LEAD_SONAME = "libcupsdriver.so"
14 14
15inherit autotools-brokensep binconfig 15inherit autotools-brokensep binconfig
16 16
17PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
18 ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 18 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
19PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" 19PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi"
20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" 20PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl"
21PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" 21PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam"
diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index ee91945..faf2ebe 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -20,6 +20,6 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
20DEPENDS = "bison-native" 20DEPENDS = "bison-native"
21 21
22# http://savannah.gnu.org/bugs/?27299 22# http://savannah.gnu.org/bugs/?27299
23CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}" 23CACHED_CONFIGUREVARS += "${@bb.utils.contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
24 24
25EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort" 25EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
diff --git a/meta/recipes-extended/iptables/iptables_1.4.21.bb b/meta/recipes-extended/iptables/iptables_1.4.21.bb
index 166457d..02bb843 100644
--- a/meta/recipes-extended/iptables/iptables_1.4.21.bb
+++ b/meta/recipes-extended/iptables/iptables_1.4.21.bb
@@ -31,7 +31,7 @@ inherit autotools
31 31
32EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \ 32EXTRA_OECONF = "--with-kernel=${STAGING_INCDIR} \
33 " 33 "
34PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 34PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
35 " 35 "
36 36
37PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," 37PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
diff --git a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
index f90dc02..eedbaa7 100644
--- a/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
+++ b/meta/recipes-extended/libarchive/libarchive_3.1.2.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b4e3ffd607d6686c6cb2f63394370841"
8PACKAGECONFIG ?= "libxml2 zlib bz2" 8PACKAGECONFIG ?= "libxml2 zlib bz2"
9 9
10PACKAGECONFIG_append_class-target = "\ 10PACKAGECONFIG_append_class-target = "\
11 ${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \ 11 ${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)} \
12 ${@base_contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'xattr', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \
14" 14"
15 15
16PACKAGECONFIG_append_class-nativesdk = " largefile" 16PACKAGECONFIG_append_class-nativesdk = " largefile"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
index b87213c..ad3f240 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-full-cmdline.bb
@@ -133,7 +133,7 @@ RDEPENDS_packagegroup-core-full-cmdline-initscripts = "\
133RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\ 133RDEPENDS_packagegroup-core-full-cmdline-multiuser = "\
134 cracklib \ 134 cracklib \
135 gzip \ 135 gzip \
136 ${@base_contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \ 136 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libuser', '', d)} \
137 shadow \ 137 shadow \
138 sudo \ 138 sudo \
139 " 139 "
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 914a7a9..553befd 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -209,7 +209,7 @@ QT4PKGS = " \
209 libqtxml4 \ 209 libqtxml4 \
210 libqtnetwork4 \ 210 libqtnetwork4 \
211 qt4-plugin-sqldriver-sqlite \ 211 qt4-plugin-sqldriver-sqlite \
212 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ 212 ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
213 " 213 "
214QT4PKGS_mips64 = "" 214QT4PKGS_mips64 = ""
215 215
diff --git a/meta/recipes-extended/pam/libpam_1.1.6.bb b/meta/recipes-extended/pam/libpam_1.1.6.bb
index 7c0111f..7e55adf 100644
--- a/meta/recipes-extended/pam/libpam_1.1.6.bb
+++ b/meta/recipes-extended/pam/libpam_1.1.6.bb
@@ -131,13 +131,13 @@ do_install() {
131 # The lsb requires unix_chkpwd has setuid permission 131 # The lsb requires unix_chkpwd has setuid permission
132 chmod 4755 ${D}${sbindir}/unix_chkpwd 132 chmod 4755 ${D}${sbindir}/unix_chkpwd
133 133
134 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 134 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
135 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session 135 echo "session optional pam_systemd.so" >> ${D}${sysconfdir}/pam.d/common-session
136 fi 136 fi
137} 137}
138 138
139python do_pam_sanity () { 139python do_pam_sanity () {
140 if not base_contains('DISTRO_FEATURES', 'pam', True, False, d): 140 if not bb.utils.contains('DISTRO_FEATURES', 'pam', True, False, d):
141 bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly") 141 bb.warn("Building libpam but 'pam' isn't in DISTRO_FEATURES, PAM won't work correctly")
142} 142}
143addtask pam_sanity before do_configure 143addtask pam_sanity before do_configure
diff --git a/meta/recipes-extended/screen/screen_4.0.3.bb b/meta/recipes-extended/screen/screen_4.0.3.bb
index d83dda0..6fd02a0 100644
--- a/meta/recipes-extended/screen/screen_4.0.3.bb
+++ b/meta/recipes-extended/screen/screen_4.0.3.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0774d66808b0f602e94448108f59448b \
11 11
12SECTION = "console/utils" 12SECTION = "console/utils"
13DEPENDS = "ncurses \ 13DEPENDS = "ncurses \
14 ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 14 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15RDEPENDS_${PN} = "base-files" 15RDEPENDS_${PN} = "base-files"
16 16
17PR = "r4" 17PR = "r4"
@@ -20,7 +20,7 @@ SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz;name=tarball \
20 ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-14.diff.gz;name=patch \ 20 ${DEBIAN_MIRROR}/main/s/screen/screen_4.0.3-14.diff.gz;name=patch \
21 file://configure.patch \ 21 file://configure.patch \
22 file://fix-parallel-make.patch \ 22 file://fix-parallel-make.patch \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 23 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
24 24
25PAM_SRC_URI = "file://screen.pam" 25PAM_SRC_URI = "file://screen.pam"
26 26
@@ -33,10 +33,10 @@ SRC_URI[patch.sha256sum] = "10acb274b2fb0bb7137a0d66e52fa0f18125bc5198c7a8d5af38
33inherit autotools 33inherit autotools
34 34
35EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \ 35EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 \
36 ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" 36 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}"
37 37
38do_install_append () { 38do_install_append () {
39 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 39 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
40 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen 40 install -D -m 644 ${WORKDIR}/screen.pam ${D}/${sysconfdir}/pam.d/screen
41 fi 41 fi
42} 42}
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc
index a4e9634..6848e05 100644
--- a/meta/recipes-extended/shadow/shadow.inc
+++ b/meta/recipes-extended/shadow/shadow.inc
@@ -15,7 +15,7 @@ SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
15 file://shadow_fix_for_automake-1.12.patch \ 15 file://shadow_fix_for_automake-1.12.patch \
16 file://shadow-4.1.3-dots-in-usernames.patch \ 16 file://shadow-4.1.3-dots-in-usernames.patch \
17 file://shadow-4.1.4.2-env-reset-keep-locale.patch \ 17 file://shadow-4.1.4.2-env-reset-keep-locale.patch \
18 ${@base_contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \ 18 ${@bb.utils.contains('PACKAGECONFIG', 'pam', '${PAM_SRC_URI}', '', d)} \
19 " 19 "
20 20
21SRC_URI_append_class-target = " \ 21SRC_URI_append_class-target = " \
@@ -81,7 +81,7 @@ PAM_PLUGINS = "libpam-runtime \
81 pam-plugin-shells \ 81 pam-plugin-shells \
82 pam-plugin-rootok" 82 pam-plugin-rootok"
83 83
84PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 84PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
85PACKAGECONFIG_class-native = "" 85PACKAGECONFIG_class-native = ""
86PACKAGECONFIG_class-nativesdk = "" 86PACKAGECONFIG_class-nativesdk = ""
87PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}" 87PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam,${PAM_PLUGINS}"
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index 43e578f..5675cb8 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -2,7 +2,7 @@ require shadow.inc
2 2
3# Build falsely assumes that if --enable-libpam is set, we don't need to link against 3# Build falsely assumes that if --enable-libpam is set, we don't need to link against
4# libcrypt. This breaks chsh. 4# libcrypt. This breaks chsh.
5BUILD_LDFLAGS_append_class-target = " ${@base_contains('DISTRO_FEATURES', 'pam', base_contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}" 5BUILD_LDFLAGS_append_class-target = " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', bb.utils.contains('DISTRO_FEATURES', 'libc-crypt', '-lcrypt', '', d), '', d)}"
6 6
7BBCLASSEXTEND = "native nativesdk" 7BBCLASSEXTEND = "native nativesdk"
8 8
diff --git a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb
index b4d18e8..7851473 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.9p5.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.9p5.bb
@@ -1,20 +1,20 @@
1require sudo.inc 1require sudo.inc
2 2
3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \ 3SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
4 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}" 4 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)}"
5 5
6PAM_SRC_URI = "file://sudo.pam" 6PAM_SRC_URI = "file://sudo.pam"
7 7
8SRC_URI[md5sum] = "d3f1f1cfca6b2b06b048e1abb7d0227e" 8SRC_URI[md5sum] = "d3f1f1cfca6b2b06b048e1abb7d0227e"
9SRC_URI[sha256sum] = "bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21" 9SRC_URI[sha256sum] = "bc9d5c96de5f8b4d2b014f87a37870aef60d2891c869202454069150a21a5c21"
10 10
11DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 11DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
12RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}" 12RDEPENDS_${PN} += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
13 13
14EXTRA_OECONF += " ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}" 14EXTRA_OECONF += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)}"
15 15
16do_install_append () { 16do_install_append () {
17 if [ "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then 17 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" = "pam" ]; then
18 install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo 18 install -D -m 664 ${WORKDIR}/sudo.pam ${D}/${sysconfdir}/pam.d/sudo
19 fi 19 fi
20 20
diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc
index 3a51810..bcf8aa7 100644
--- a/meta/recipes-extended/sysklogd/sysklogd.inc
+++ b/meta/recipes-extended/sysklogd/sysklogd.inc
@@ -40,7 +40,7 @@ do_install () {
40 40
41# sysklogd package has no internal systemd support, so we weigh busybox's 41# sysklogd package has no internal systemd support, so we weigh busybox's
42# sysklogd utility over it in case of systemd 42# sysklogd utility over it in case of systemd
43ALTERNATIVE_PRIORITY = "${@base_contains('DISTRO_FEATURES','systemd','10','100',d)}" 43ALTERNATIVE_PRIORITY = "${@bb.utils.contains('DISTRO_FEATURES','systemd','10','100',d)}"
44 44
45ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf" 45ALTERNATIVE_${PN} = "syslogd klogd syslog-init syslog-conf"
46 46
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
index 50e54d8..19848b5 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.3.bb
@@ -31,7 +31,7 @@ LIBV = "2.10.0"
31GDK_PIXBUF_LOADERS ?= "png jpeg" 31GDK_PIXBUF_LOADERS ?= "png jpeg"
32 32
33PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" 33PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}"
34PACKAGECONFIG_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" 34PACKAGECONFIG_linuxstdbase = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}"
35PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" 35PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}"
36 36
37PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" 37PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng"
@@ -45,7 +45,7 @@ PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11"
45 45
46EXTRA_OECONF = "\ 46EXTRA_OECONF = "\
47 --disable-introspection \ 47 --disable-introspection \
48 ${@base_contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \ 48 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '--enable-installed-tests', '--disable-installed-tests', d)} \
49" 49"
50 50
51PACKAGES =+ "${PN}-xlib" 51PACKAGES =+ "${PN}-xlib"
diff --git a/meta/recipes-gnome/gnome/gconf_3.2.6.bb b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
index e081ec3..17fdafa 100644
--- a/meta/recipes-gnome/gnome/gconf_3.2.6.bb
+++ b/meta/recipes-gnome/gnome/gconf_3.2.6.bb
@@ -45,7 +45,7 @@ do_install_append_class-native() {
45} 45}
46 46
47# disable dbus-x11 when x11 isn't in DISTRO_FEATURES 47# disable dbus-x11 when x11 isn't in DISTRO_FEATURES
48RDEPENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}" 48RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)}"
49RDEPENDS_${PN}_class-native = "" 49RDEPENDS_${PN}_class-native = ""
50 50
51FILES_${PN} += "${libdir}/GConf/* \ 51FILES_${PN} += "${libdir}/GConf/* \
diff --git a/meta/recipes-gnome/gtk+/gtk+.inc b/meta/recipes-gnome/gtk+/gtk+.inc
index 73d624c..dd1fa1b 100644
--- a/meta/recipes-gnome/gtk+/gtk+.inc
+++ b/meta/recipes-gnome/gtk+/gtk+.inc
@@ -14,7 +14,7 @@ X11DEPENDS = "virtual/libx11 libxext libxcursor libxrandr libxdamage libxrender
14DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \ 14DEPENDS = "glib-2.0 pango atk jpeg libpng gdk-pixbuf-native docbook-utils-native \
15 cairo gdk-pixbuf" 15 cairo gdk-pixbuf"
16 16
17PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 17PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
18 18
19PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}" 19PACKAGECONFIG[x11] = "--with-x=yes --with-gdktarget=x11,--with-x=no,${X11DEPENDS}"
20 20
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index e769ca5..9e96275 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -33,8 +33,8 @@ EXTRA_OECONF += " \
33 --disable-introspection \ 33 --disable-introspection \
34" 34"
35 35
36PACKAGECONFIG ??= "${@base_contains("DISTRO_FEATURES", "x11", "x11", "", d)} \ 36PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "x11", "x11", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}" 37 ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)}"
38 38
39PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" 39PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes"
40PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon" 40PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,wayland libxkbcommon"
diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index b15fbc9..c0af1e3 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -13,8 +13,8 @@ LICENSE = "MPL-1 & LGPLv2.1"
13X11DEPENDS = "virtual/libx11 libsm libxrender libxext" 13X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
14DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" 14DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
15 15
16PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 16PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" 17 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
18PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" 18PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}"
19PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" 19PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb"
20PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" 20PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 3ca19b3..77035d7 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -33,8 +33,8 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E
33PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" 33PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland"
34 34
35# Default configuration, distros might want to override 35# Default configuration, distros might want to override
36PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 36PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" 37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}"
38 38
39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" 39FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
40FILES_${PN}-examples = "${libdir}/clutter/examples" 40FILES_${PN}-examples = "${libdir}/clutter/examples"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 15bfea2..a4a8550 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -53,8 +53,8 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
53# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by 53# Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by
54# default. 54# default.
55PACKAGECONFIG ??= "cogl-pango gles2 \ 55PACKAGECONFIG ??= "cogl-pango gles2 \
56 ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ 56 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
57 ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" 57 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"
58 58
59FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 59FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
60FILES_libcogl = "${libdir}/libcogl${SOLIBS}" 60FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
index e19c388..4a77121 100644
--- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
+++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4"
12 12
13PROVIDES = "virtual/libsdl" 13PROVIDES = "virtual/libsdl"
14 14
15DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 15DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl libglu', '', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
18 tslib" 18 tslib"
19DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 19DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
20 20
21PR = "r3" 21PR = "r3"
22 22
@@ -39,15 +39,15 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers
39 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ 39 --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \
40 --disable-xbios --disable-gem --disable-video-dummy \ 40 --disable-xbios --disable-gem --disable-video-dummy \
41 --enable-input-events --enable-input-tslib --enable-pthreads \ 41 --enable-input-events --enable-input-tslib --enable-pthreads \
42 ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ 42 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
43 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ 43 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
44 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
45 --disable-video-svga \ 45 --disable-video-svga \
46 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ 46 --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \
47 --disable-rpath \ 47 --disable-rpath \
48 --disable-pulseaudio" 48 --disable-pulseaudio"
49 49
50PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 50PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
51PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," 51PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
52 52
53PARALLEL_MAKE = "" 53PARALLEL_MAKE = ""
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
index 7958f7b..fa19566 100644
--- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
+++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.1.bb
@@ -12,11 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=0605ca7e995ab1217e0bb988731a87fe"
12 12
13PROVIDES = "virtual/libsdl2" 13PROVIDES = "virtual/libsdl2"
14 14
15DEPENDS = "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 15DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \
17 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ 17 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \
18 tslib" 18 tslib"
19DEPENDS_class-nativesdk = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" 19DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}"
20 20
21SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ 21SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \
22 " 22 "
@@ -32,14 +32,14 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \
32 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ 32 --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \
33 --disable-video-dummy \ 33 --disable-video-dummy \
34 --enable-input-tslib --enable-pthreads \ 34 --enable-input-tslib --enable-pthreads \
35 ${@base_contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \
36 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ 37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \
38 --enable-sdl-dlopen \ 38 --enable-sdl-dlopen \
39 --disable-rpath \ 39 --disable-rpath \
40 --disable-pulseaudio" 40 --disable-pulseaudio"
41 41
42PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 42PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
43PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," 43PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib,"
44 44
45PARALLEL_MAKE = "" 45PARALLEL_MAKE = ""
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
index 4bb92f4..d6e6fbc 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.1.0.bb
@@ -22,10 +22,10 @@ SRC_URI[sha256sum] = "9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a
22inherit autotools pkgconfig 22inherit autotools pkgconfig
23 23
24PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ 24PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \
25 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 25 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
26 26
27# The Wayland code doesn't work with Wayland 1.0, so disable it for now 27# The Wayland code doesn't work with Wayland 1.0, so disable it for now
28#${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 28#${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
29 29
30PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm" 30PACKAGECONFIG[drm] = "--enable-libdrm,--disable-libdrm,libdrm"
31PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" 31PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
index 21f6151..8c7d8e8 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_9.2.5.bb
@@ -6,6 +6,6 @@ FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/mesa-${PV}", "${FILE_DIRNAM
6 6
7PROVIDES = "virtual/libgl virtual/mesa" 7PROVIDES = "virtual/libgl virtual/mesa"
8 8
9PACKAGECONFIG ??= "dri ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 9PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
10 10
11EXCLUDE_FROM_WORLD = "1" 11EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 96313b5..a33b7b5 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -26,8 +26,8 @@ REQUIRED_DISTRO_FEATURES = "opengl"
26EXTRA_OECONF = "--enable-shared-glapi" 26EXTRA_OECONF = "--enable-shared-glapi"
27 27
28PACKAGECONFIG ??= "egl gles dri \ 28PACKAGECONFIG ??= "egl gles dri \
29 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ 29 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\
30 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\
31 " 31 "
32 32
33X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 33X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
@@ -45,18 +45,18 @@ EXTRA_OECONF += "--enable-gbm"
45PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" 45PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2"
46 46
47EGL_PLATFORMS = "drm" 47EGL_PLATFORMS = "drm"
48EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'x11', ',x11', '', d)}" 48EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'x11', ',x11', '', d)}"
49EGL_PLATFORMS .="${@base_contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}" 49EGL_PLATFORMS .="${@bb.utils.contains('PACKAGECONFIG', 'wayland', ',wayland', '', d)}"
50PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl" 50PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS}, --disable-egl"
51 51
52PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg" 52PACKAGECONFIG[openvg] = "--enable-openvg, --disable-openvg"
53 53
54GALLIUMDRIVERS = "swrast" 54GALLIUMDRIVERS = "swrast"
55GALLIUMDRIVERS_LLVM33 = "${@base_contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" 55GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}"
56GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" 56GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}"
57GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" 57GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}"
58GALLIUMDRIVERS_append_x86 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 58GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
59GALLIUMDRIVERS_append_x86-64 = "${@base_contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" 59GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}"
60# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers 60# keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers
61PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" 61PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers"
62PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" 62PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl"
diff --git a/meta/recipes-graphics/mesa/mesa_9.2.5.bb b/meta/recipes-graphics/mesa/mesa_9.2.5.bb
index 737ed1a..02ecd46 100644
--- a/meta/recipes-graphics/mesa/mesa_9.2.5.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.2.5.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}/Mesa-${PV}"
13#because we cannot rely on the fact that all apps will use pkgconfig, 13#because we cannot rely on the fact that all apps will use pkgconfig,
14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 14#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
15do_install_append() { 15do_install_append() {
16 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 16 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
17 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 17 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
18 fi 18 fi
19} 19}
diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb
index 0abedbc..1e6fdb5 100644
--- a/meta/recipes-graphics/mesa/mesa_git.bb
+++ b/meta/recipes-graphics/mesa/mesa_git.bb
@@ -18,7 +18,7 @@ S = "${WORKDIR}/git"
18#because we cannot rely on the fact that all apps will use pkgconfig, 18#because we cannot rely on the fact that all apps will use pkgconfig,
19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER 19#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
20do_install_append() { 20do_install_append() {
21 if ${@base_contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then 21 if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
22 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@base_contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h 22 sed -i -e 's/^#ifdef MESA_EGL_NO_X11_HEADERS/#if ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
23 fi 23 fi
24} 24}
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
index 334a17e..7786133 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
3 3
4inherit packagegroup 4inherit packagegroup
5 5
6TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 6TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
7 7
8RDEPENDS_${PN} = " \ 8RDEPENDS_${PN} = " \
9 directfb \ 9 directfb \
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index 4a20d20..4f79315 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -12,7 +12,7 @@ LICENSE = "LGPLv2.0+"
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native"
14 14
15PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 15PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
16PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" 16PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}"
17 17
18BBCLASSEXTEND = "native" 18BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/wayland/weston_1.4.0.bb b/meta/recipes-graphics/wayland/weston_1.4.0.bb
index 5213166..afdc49c 100644
--- a/meta/recipes-graphics/wayland/weston_1.4.0.bb
+++ b/meta/recipes-graphics/wayland/weston_1.4.0.bb
@@ -28,9 +28,9 @@ EXTRA_OECONF = "--enable-setuid-install \
28 --disable-rdp-compositor" 28 --disable-rdp-compositor"
29 29
30 30
31PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ 31PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \
32 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 32 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
33 ${@base_contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ 33 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \
34 " 34 "
35# 35#
36# Compositor choices 36# Compositor choices
@@ -59,7 +59,7 @@ do_install_append() {
59 rm -f ${D}/${libdir}/weston/*.la 59 rm -f ${D}/${libdir}/weston/*.la
60 60
61 # If X11, ship a desktop file to launch it 61 # If X11, ship a desktop file to launch it
62 if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then 62 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "x11" ]; then
63 install -d ${D}${datadir}/applications 63 install -d ${D}${datadir}/applications
64 install ${WORKDIR}/weston.desktop ${D}${datadir}/applications 64 install ${WORKDIR}/weston.desktop ${D}${datadir}/applications
65 65
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
index e4508a9..0a16ff5 100644
--- a/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
+++ b/meta/recipes-graphics/x11-common/xserver-nodm-init.bb
@@ -22,7 +22,7 @@ do_install() {
22 install -d ${D}${sysconfdir}/init.d 22 install -d ${D}${sysconfdir}/init.d
23 install xserver-nodm ${D}${sysconfdir}/init.d 23 install xserver-nodm ${D}${sysconfdir}/init.d
24 24
25 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 25 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
26 install -d ${D}${sysconfdir}/default 26 install -d ${D}${sysconfdir}/default
27 install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm 27 install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
28 install -d ${D}${systemd_unitdir}/system 28 install -d ${D}${systemd_unitdir}/system
@@ -36,7 +36,7 @@ do_install() {
36 fi 36 fi
37 fi 37 fi
38 38
39 if ${@base_contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then 39 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
40 if [ "${ROOTLESS_X}" = "1" ] ; then 40 if [ "${ROOTLESS_X}" = "1" ] ; then
41 install -d ${D}${sysconfdir}/X11 41 install -d ${D}${sysconfdir}/X11
42 install Xusername ${D}${sysconfdir}/X11 42 install Xusername ${D}${sysconfdir}/X11
diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
index 9785a16..3d98172 100644
--- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
+++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb
@@ -18,6 +18,6 @@ DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdama
18 18
19inherit autotools-brokensep 19inherit autotools-brokensep
20 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}"
22PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" 22PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi"
23PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" 23PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
index 78edd5a..cd8fd63 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb
@@ -15,7 +15,7 @@ SRC_URI += "file://disable-dri2-tests.patch \
15 file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ 15 file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
16 " 16 "
17 17
18PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" 18PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
19 19
20PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" 20PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"
21PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" 21PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb
index b74d174..60eace4 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.910.bb
@@ -14,7 +14,7 @@ DEPENDS += "virtual/libx11 drm libpciaccess pixman"
14SRC_URI += "file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ 14SRC_URI += "file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \
15 " 15 "
16 16
17PACKAGECONFIG ??= "sna udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" 17PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
18 18
19PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" 19PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto"
20PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" 20PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
index 1a687c8..cf5dfeb 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.1.bb
@@ -16,5 +16,5 @@ inherit autotools pkgconfig
16 16
17EXTRA_OECONF = "--disable-docs" 17EXTRA_OECONF = "--disable-docs"
18 18
19PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 19PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
20PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb" 20PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 2bacbe5..2e83d53 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -116,7 +116,7 @@ EXTRA_OECONF += "--with-fop=no \
116 ac_cv_file__usr_share_sgml_X11_defs_ent=no \ 116 ac_cv_file__usr_share_sgml_X11_defs_ent=no \
117" 117"
118 118
119PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" 119PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}"
120PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 120PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
121PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" 121PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto"
122PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" 122PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto"
diff --git a/meta/recipes-kernel/kmod/kmod_git.bb b/meta/recipes-kernel/kmod/kmod_git.bb
index c55cbd3..d4c21a4 100644
--- a/meta/recipes-kernel/kmod/kmod_git.bb
+++ b/meta/recipes-kernel/kmod/kmod_git.bb
@@ -44,7 +44,7 @@ do_compile_ptest () {
44 oe_runmake buildtest-TESTS rootfs 44 oe_runmake buildtest-TESTS rootfs
45} 45}
46 46
47INHIBIT_PACKAGE_STRIP = "${@base_contains("DISTRO_FEATURES", "ptest", "1", "0", d)}" 47INHIBIT_PACKAGE_STRIP = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", "1", "0", d)}"
48INSANE_SKIP_${PN}-ptest = "arch" 48INSANE_SKIP_${PN}-ptest = "arch"
49 49
50inherit update-alternatives 50inherit update-alternatives
diff --git a/meta/recipes-kernel/latencytop/latencytop_0.5.bb b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
index af44eb6..516e2c5 100644
--- a/meta/recipes-kernel/latencytop/latencytop_0.5.bb
+++ b/meta/recipes-kernel/latencytop/latencytop_0.5.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.latencytop.org/"
4LICENSE = "GPLv2" 4LICENSE = "GPLv2"
5LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa" 5LIC_FILES_CHKSUM = "file://latencytop.c;endline=23;md5=ee9ea9b1415356e5734adad4a87dc7fa"
6 6
7DEPENDS = "virtual/libintl ncurses glib-2.0 ${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" 7DEPENDS = "virtual/libintl ncurses glib-2.0 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
8 8
9PR = "r3" 9PR = "r3"
10 10
@@ -15,7 +15,7 @@ SRC_URI = "http://www.latencytop.org/download/latencytop-${PV}.tar.gz \
15SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c" 15SRC_URI[md5sum] = "73bb3371c6ee0b0e68e25289027e865c"
16SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef" 16SRC_URI[sha256sum] = "9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef"
17 17
18EXTRA_OEMAKE_X = "${@base_contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}" 18EXTRA_OEMAKE_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'HAS_GTK_GUI=1', '', d)}"
19 19
20CFLAGS += "${LDFLAGS}" 20CFLAGS += "${LDFLAGS}"
21 21
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index db9d910..c280313 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
19# entire image as -O0, we override it with -O2 here and give a note about it. 19# entire image as -O0, we override it with -O2 here and give a note about it.
20def get_optimization(d): 20def get_optimization(d):
21 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True) 21 selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
22 if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x": 22 if bb.utils.contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
23 bb.note("systemtap can't be built with -O0, -O2 will be used instead.") 23 bb.note("systemtap can't be built with -O0, -O2 will be used instead.")
24 return selected_optimization.replace("-O0", "-O2") 24 return selected_optimization.replace("-O0", "-O2")
25 return selected_optimization 25 return selected_optimization
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
index 4f64a38..dfa9b97 100644
--- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
+++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.27.bb
@@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://hdsploader/COPYING;md5=94d55d512a9ba36caa9b7df079bae1
11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \ 11SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/alsa-tools-${PV}.tar.bz2 \
12 file://mips_has_no_io_h.patch \ 12 file://mips_has_no_io_h.patch \
13 file://autotools.patch \ 13 file://autotools.patch \
14 ${@base_contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}" 14 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', 'file://makefile_no_gtk.patch', d)}"
15 15
16SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51" 16SRC_URI[md5sum] = "1ea381d00a6069a98613aa7effa4cb51"
17SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2" 17SRC_URI[sha256sum] = "6562611b5a6560712f109e09740a9d4fa47296b07ed9590cb44139c5f154ada2"
@@ -20,7 +20,7 @@ inherit autotools-brokensep
20 20
21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'" 21EXTRA_OEMAKE += "GITCOMPILE_ARGS='--host=${HOST_SYS} --build=${BUILD_SYS} --target=${TARGET_SYS} --with-libtool-sysroot=${STAGING_DIR_HOST} --prefix=${prefix}'"
22 22
23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk+', '', d)}"
24PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3," 24PACKAGECONFIG[gtk+] = ",,gtk+ gtk+3,"
25 25
26# configure.ac/.in doesn't exist so force copy 26# configure.ac/.in doesn't exist so force copy
diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
index 056fca2..2edacc1 100644
--- a/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
+++ b/meta/recipes-multimedia/alsa/alsa-utils_1.0.27.2.bb
@@ -86,7 +86,7 @@ do_install() {
86 # See alsa-utils-alsaconf_${PV}.bb 86 # See alsa-utils-alsaconf_${PV}.bb
87 rm ${D}${sbindir}/alsaconf 87 rm ${D}${sbindir}/alsaconf
88 88
89 if ${@base_contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then 89 if ${@bb.utils.contains('PACKAGECONFIG', 'udev', 'false', 'true', d)}; then
90 # This is where alsa-utils will install its rules if we don't tell it anything else. 90 # This is where alsa-utils will install its rules if we don't tell it anything else.
91 rm -rf ${D}/lib/udev 91 rm -rf ${D}/lib/udev
92 rmdir --ignore-fail-on-non-empty ${D}/lib 92 rmdir --ignore-fail-on-non-empty ${D}/lib
diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 9fb2f8f..518ab72 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -21,7 +21,7 @@ ALLOW_EMPTY_gst-meta-debug = "1"
21ALLOW_EMPTY_gst-meta-video = "1" 21ALLOW_EMPTY_gst-meta-video = "1"
22 22
23RDEPENDS_gst-meta-base = "\ 23RDEPENDS_gst-meta-base = "\
24 ${@base_contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \ 24 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gst-meta-x11-base', '', d)} \
25 gstreamer \ 25 gstreamer \
26 gst-plugins-base-playbin \ 26 gst-plugins-base-playbin \
27 gst-plugins-base-decodebin \ 27 gst-plugins-base-decodebin \
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
index dceb12c..a26acef 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb
@@ -17,7 +17,7 @@ EXTRA_OECONF += "--disable-experimental \
17 --disable-vdpau --disable-apexsink" 17 --disable-vdpau --disable-apexsink"
18 18
19PACKAGECONFIG ??= "bzip curl \ 19PACKAGECONFIG ??= "bzip curl \
20 ${@base_contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}" 20 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'rsvg', '', d)}"
21 21
22PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2" 22PACKAGECONFIG[bzip] = "--enable-bz2,--disable-bz2,bzip2"
23PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl" 23PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 53cc55c..83b856b 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -20,7 +20,7 @@ inherit gettext
20 20
21EXTRA_OECONF += "--disable-freetypetest" 21EXTRA_OECONF += "--disable-freetypetest"
22 22
23PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 23PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
24 24
25PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs" 25PACKAGECONFIG[gnomevfs] = "--enable-gnome_vfs,--disable-gnome_vfs,gnome-vfs"
26PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc" 26PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
index e044340..c87e018 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
7 7
8PR = "r8" 8PR = "r8"
9 9
10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg" 10PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} jpeg"
11PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" 11PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
12PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" 12PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
13PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" 13PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
index cb8dd1a..a703d9b 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bb
@@ -19,7 +19,7 @@ ALLOW_EMPTY_gstreamer1.0-meta-debug = "1"
19ALLOW_EMPTY_gstreamer1.0-meta-video = "1" 19ALLOW_EMPTY_gstreamer1.0-meta-video = "1"
20 20
21RDEPENDS_gstreamer1.0-meta-base = "\ 21RDEPENDS_gstreamer1.0-meta-base = "\
22 ${@base_contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gstreamer1.0-meta-x11-base', '', d)} \
23 gstreamer1.0 \ 23 gstreamer1.0 \
24 gstreamer1.0-plugins-base-playback \ 24 gstreamer1.0-plugins-base-playback \
25 gstreamer1.0-plugins-base-gio \ 25 gstreamer1.0-plugins-base-gio \
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
index 08440a2..ceb2de1 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -10,10 +10,10 @@ inherit gettext
10 10
11 11
12PACKAGECONFIG ??= " \ 12PACKAGECONFIG ??= " \
13 ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglgles', '', d)} \
15 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \ 15 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
16 ${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ 16 ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
17 orc curl uvch264 neon \ 17 orc curl uvch264 neon \
18 hls sbc dash bz2 smoothstreaming \ 18 hls sbc dash bz2 smoothstreaming \
19 " 19 "
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
index b56c506..eb13277 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -2,7 +2,7 @@ require gstreamer1.0-plugins.inc
2 2
3LICENSE = "GPLv2+ & LGPLv2+" 3LICENSE = "GPLv2+ & LGPLv2+"
4 4
5DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" 5DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
6DEPENDS += "freetype liboil util-linux" 6DEPENDS += "freetype liboil util-linux"
7 7
8inherit gettext 8inherit gettext
@@ -10,8 +10,8 @@ inherit gettext
10PACKAGES_DYNAMIC =+ "^libgst.*" 10PACKAGES_DYNAMIC =+ "^libgst.*"
11 11
12PACKAGECONFIG ??= " \ 12PACKAGECONFIG ??= " \
13 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
14 ${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ 14 ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
15 orc ivorbis ogg theora vorbis \ 15 orc ivorbis ogg theora vorbis \
16 " 16 "
17 17
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
index 06de4da..5e313ef 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -9,8 +9,8 @@ inherit gettext
9 9
10 10
11PACKAGECONFIG ??= " \ 11PACKAGECONFIG ??= " \
12 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ 12 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
13 ${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 13 ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
14 orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \ 14 orc cairo flac gdk-pixbuf jpeg libpng soup speex taglib \
15 " 15 "
16 16
diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc
index 2152936..a05a2a6 100644
--- a/meta/recipes-multimedia/libav/libav.inc
+++ b/meta/recipes-multimedia/libav/libav.inc
@@ -23,7 +23,7 @@ BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8" 23EXTRA_FFCONF_armv7a = "--cpu=cortex-a8"
24EXTRA_FFCONF ?= "" 24EXTRA_FFCONF ?= ""
25 25
26PACKAGECONFIG ??= "bzip2 x264 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 26PACKAGECONFIG ??= "bzip2 x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
27PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack" 27PACKAGECONFIG[jack] = "--enable-indev=jack,--disable-indev=jack,jack"
28PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2" 28PACKAGECONFIG[bzip2] = "--enable-bzlib,--disable-bzlib,bzip2"
29PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger" 29PACKAGECONFIG[schroedinger] = "--enable-libschroedinger,--disable-libschroedinger,schroedinger"
diff --git a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
index fe0e397..9246298 100644
--- a/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
+++ b/meta/recipes-multimedia/libsndfile/libsndfile1_1.0.25.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e77fe93202736b47c07035910f47974a"
15 15
16S = "${WORKDIR}/libsndfile-${PV}" 16S = "${WORKDIR}/libsndfile-${PV}"
17 17
18PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" 18PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}"
19PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib" 19PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
20 20
21EXTRA_OECONF = "--disable-external-libs" 21EXTRA_OECONF = "--disable-external-libs"
diff --git a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
index aee2f3b..1211284 100644
--- a/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
+++ b/meta/recipes-multimedia/mpeg2dec/mpeg2dec_0.4.1.bb
@@ -6,7 +6,7 @@ LICENSE_FLAGS = "commercial"
6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154" 7 file://include/mpeg2.h;beginline=1;endline=22;md5=ead62602d4638329d3b5b86a55803154"
8 8
9DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" 9DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
10 10
11PR = "r2" 11PR = "r2"
12 12
diff --git a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
index 2176731..195a982 100644
--- a/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
+++ b/meta/recipes-multimedia/pulseaudio/pulseaudio.inc
@@ -31,10 +31,10 @@ EXTRA_OECONF = "\
31 ac_cv_header_valgrind_memcheck_h=no \ 31 ac_cv_header_valgrind_memcheck_h=no \
32" 32"
33 33
34PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \ 34PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)} \
35 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 35 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
36 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ 36 ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \
37 ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 37 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
38PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc" 38PACKAGECONFIG[bluez4] = "--enable-bluez4,--disable-bluez4,bluez4 sbc"
39PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc" 39PACKAGECONFIG[bluez5] = "--enable-bluez5,--disable-bluez5,bluez5 sbc"
40PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3" 40PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
@@ -74,7 +74,7 @@ USERADD_PARAM_pulseaudio-server = "--system --home /var/run/pulse \
74# adding the console-kit module to an image, we also get the necessary 74# adding the console-kit module to an image, we also get the necessary
75# consolekit package produced. 75# consolekit package produced.
76PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \ 76PACKAGES =+ "libpulsecore libpulsecommon libpulse libpulse-simple libpulse-mainloop-glib \
77 pulseaudio-server pulseaudio-misc ${@base_contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}" 77 pulseaudio-server pulseaudio-misc ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pulseaudio-module-console-kit', '', d)}"
78 78
79#upgrade path: 79#upgrade path:
80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf" 80RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
@@ -148,4 +148,4 @@ FILES_pulseaudio-module-gconf += "${libexecdir}/pulse/gconf-helper"
148FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer" 148FILES_pulseaudio-module-alsa-card += "${datadir}/pulseaudio/alsa-mixer"
149 149
150RDEPENDS_pulseaudio-server += "\ 150RDEPENDS_pulseaudio-server += "\
151 ${@base_contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}" 151 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'pulseaudio-module-console-kit', '', d)}"
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 6ef844f..02a649b 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -12,7 +12,7 @@ RPROVIDES_${PN} = "task-qt4e-base"
12RREPLACES_${PN} = "task-qt4e-base" 12RREPLACES_${PN} = "task-qt4e-base"
13RCONFLICTS_${PN} = "task-qt4e-base" 13RCONFLICTS_${PN} = "task-qt4e-base"
14 14
15TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 15TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
16 16
17RDEPENDS_${PN} = " \ 17RDEPENDS_${PN} = " \
18 qt4-embedded \ 18 qt4-embedded \
diff --git a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
index c6aa753..0e7c800 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt-toolchain-target.bb
@@ -6,6 +6,6 @@ require packagegroup-qt-toolchain-target.inc
6 6
7RDEPENDS_${PN} += " \ 7RDEPENDS_${PN} += " \
8 qt4-x11-free-dev \ 8 qt4-x11-free-dev \
9 ${@base_contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \ 9 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'libqtopengl4-dev', '', d)} \
10 ${@base_contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \ 10 ${@bb.utils.contains('DISTRO_FEATURES', 'openvg', 'libqtopenvg4-dev', '', d)} \
11 " 11 "
diff --git a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
index 5fe7bc9..e7e4b3c 100644
--- a/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
+++ b/meta/recipes-qt/qt4/qt-mobility-x11_1.2.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "qt4-x11-free"
3SECTION = "x11/libs" 3SECTION = "x11/libs"
4qtm_embedded := "" 4qtm_embedded := ""
5qtm_dir = "qt4" 5qtm_dir = "qt4"
6qtm_glflags := "${@base_contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} " 6qtm_glflags := "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '+=opengl', '-=opengl', d)} "
7qtm_extra_config := "" 7qtm_extra_config := ""
8 8
9inherit qt4x11 9inherit qt4x11
diff --git a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
index ff63d2b..d46acb9c 100644
--- a/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
+++ b/meta/recipes-qt/qt4/qt-mobility_1.2.0.inc
@@ -1,8 +1,8 @@
1HOMEPAGE = "http://qt-project.org/" 1HOMEPAGE = "http://qt-project.org/"
2DEPENDS = "gstreamer util-linux" 2DEPENDS = "gstreamer util-linux"
3 3
4PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ 4PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
5 ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}" 5 ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
6PACKAGECONFIG[bluetooth] = ",,bluez4" 6PACKAGECONFIG[bluetooth] = ",,bluez4"
7PACKAGECONFIG[pulseaudio] = ",,pulseaudio" 7PACKAGECONFIG[pulseaudio] = ",,pulseaudio"
8 8
@@ -65,12 +65,12 @@ maemo5-contacts_enabled = no
65maemo5-calendar_enabled = no 65maemo5-calendar_enabled = no
66maemo6-landmarks_enabled = no 66maemo6-landmarks_enabled = no
67bme_enabled = no 67bme_enabled = no
68bluez_enabled = ${@base_contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)} 68bluez_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'bluetooth', 'yes', 'no', d)}
69proj_enabled = no 69proj_enabled = no
70gstreamer-photography_enabled = no 70gstreamer-photography_enabled = no
71gstreamer-appsrc_enabled = yes 71gstreamer-appsrc_enabled = yes
72blkid_enabled = yes 72blkid_enabled = yes
73pulseaudio_enabled = ${@base_contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)} 73pulseaudio_enabled = ${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}
74udev_enabled = yes 74udev_enabled = yes
75iphb_enabled = no 75iphb_enabled = no
76nfc_symbian_enabled = no 76nfc_symbian_enabled = no
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 73ed2bc..3b1e0fe 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -10,7 +10,7 @@ QT4DEPENDS = ""
10 10
11INC_PR = "r50" 11INC_PR = "r50"
12 12
13QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " 13QT_GLFLAGS ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
14QT_GLFLAGS_qemux86 = "-opengl" 14QT_GLFLAGS_qemux86 = "-opengl"
15QT_GLFLAGS_qemuppc = "-opengl" 15QT_GLFLAGS_qemuppc = "-opengl"
16QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle" 16QT_X11_FLAGS ?= "-no-xinerama -no-xkb -no-gtkstyle"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 9a10138..0023f16 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,7 +1,7 @@
1inherit qmake_base 1inherit qmake_base
2 2
3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu" 3DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff icu"
4DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 4DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
5 5
6require qt4_arch.inc 6require qt4_arch.inc
7 7
@@ -18,7 +18,7 @@ QT_XML ?= "-xmlpatterns"
18QT_WEBKIT ?= "-webkit" 18QT_WEBKIT ?= "-webkit"
19QT_PHONON ?= "-phonon" 19QT_PHONON ?= "-phonon"
20QT_DBUS ?= "-qdbus" 20QT_DBUS ?= "-qdbus"
21QT_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}" 21QT_MULTIMEDIA ?= "${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', '-pulseaudio', '-no-pulseaudio', d)}"
22 22
23QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ 23QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
24 -shared -no-nas-sound -no-nis \ 24 -shared -no-nas-sound -no-nis \
diff --git a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
index 8d43785..da4d98a 100644
--- a/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
+++ b/meta/recipes-sato/gtk-engines/gtk-sato-engine_git.bb
@@ -11,4 +11,4 @@ SRC_URI = "git://git.yoctoproject.org/${BPN}"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" 14EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
index 31d32c6..490e2bc 100644
--- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
+++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_git.bb
@@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
8 file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03" 8 file://applets/startup/startup.c;endline=22;md5=b0a64fbef3097d79f8264e6907a98f03"
9 9
10DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib" 10DEPENDS = "gnome-common gtk+ startup-notification dbus dbus-glib"
11DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" 11DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}"
12DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" 12DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}"
13 13
14SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae" 14SRCREV = "26a3a67b41c50e0ae163d8fe86ccf7a0f0a671ae"
15PV = "2.0+git${SRCPV}" 15PV = "2.0+git${SRCPV}"
@@ -22,8 +22,8 @@ SRC_URI = "git://git.yoctoproject.org/${BPN} \
22 file://silence-warnings.patch" 22 file://silence-warnings.patch"
23 23
24EXTRA_OECONF = "--enable-startup-notification --enable-dbus" 24EXTRA_OECONF = "--enable-startup-notification --enable-dbus"
25EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" 25EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}"
26EXTRA_OECONF += " ${@base_contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" 26EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}"
27 27
28S = "${WORKDIR}/git" 28S = "${WORKDIR}/git"
29 29
diff --git a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
index 23dc043..0d3569d 100644
--- a/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
+++ b/meta/recipes-sato/matchbox-theme-sato/matchbox-theme-sato_git.bb
@@ -7,6 +7,6 @@ DEFAULT_PREFERENCE = "-1"
7 7
8SRC_URI = "git://git.yoctoproject.org/matchbox-sato" 8SRC_URI = "git://git.yoctoproject.org/matchbox-sato"
9 9
10EXTRA_OECONF += "${@base_contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}" 10EXTRA_OECONF += "${@bb.utils.contains('MACHINE_FEATURES', 'qvga', '--with-mode=qvga', '',d)}"
11 11
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
diff --git a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
index 3db8e6d..29f8a79 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_1.8.3.bb
@@ -15,7 +15,7 @@ ICU_LIB_powerpc = "pango"
15 15
16DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \ 16DEPENDS = "zlib enchant libsoup-2.4 curl libxml2 cairo libxslt libxt libidn gnutls \
17 gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}" 17 gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3 ${ICU_LIB}"
18DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}" 18DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
19 19
20SRC_URI = "\ 20SRC_URI = "\
21 http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \ 21 http://www.webkitgtk.org/releases/webkit-${PV}.tar.xz \
@@ -47,7 +47,7 @@ EXTRA_OECONF = "\
47 --enable-link-prefetch \ 47 --enable-link-prefetch \
48 --with-gtk=2.0 \ 48 --with-gtk=2.0 \
49 --disable-geolocation \ 49 --disable-geolocation \
50 ${@base_contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-webgl', '--disable-webgl', d)} \
51 UNICODE_CFLAGS=-D_REENTRANT \ 51 UNICODE_CFLAGS=-D_REENTRANT \
52 " 52 "
53 53
diff --git a/meta/recipes-support/boost/boost.inc b/meta/recipes-support/boost/boost.inc
index 356ca22..0a44d79 100644
--- a/meta/recipes-support/boost/boost.inc
+++ b/meta/recipes-support/boost/boost.inc
@@ -21,7 +21,7 @@ BOOST_LIBS = "\
21# optional boost-python library 21# optional boost-python library
22PACKAGECONFIG ??= "" 22PACKAGECONFIG ??= ""
23PACKAGECONFIG[python] = ",,python" 23PACKAGECONFIG[python] = ",,python"
24BOOST_LIBS += "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" 24BOOST_LIBS += "${@bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}"
25inherit python-dir 25inherit python-dir
26PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}" 26PYTHON_ROOT = "${STAGING_DIR_HOST}/${prefix}"
27 27
diff --git a/meta/recipes-support/consolekit/consolekit_0.4.6.bb b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
index c97b449..9851616 100644
--- a/meta/recipes-support/consolekit/consolekit_0.4.6.bb
+++ b/meta/recipes-support/consolekit/consolekit_0.4.6.bb
@@ -19,8 +19,8 @@ SRC_URI[sha256sum] = "b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf9751464
19 19
20S = "${WORKDIR}/ConsoleKit-${PV}" 20S = "${WORKDIR}/ConsoleKit-${PV}"
21 21
22PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 22PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
23 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 23 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
24 24
25PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam" 25PACKAGECONFIG[pam] = "--enable-pam-module --with-pam-module-dir=${base_libdir}/security,--disable-pam-module,libpam"
26# No option to turn it on or off, so rely on the build dependency for now. 26# No option to turn it on or off, so rely on the build dependency for now.
@@ -37,7 +37,7 @@ FILES_pam-plugin-ck-connector += "${base_libdir}/security/*.so"
37RDEPENDS_pam-plugin-ck-connector += "${PN}" 37RDEPENDS_pam-plugin-ck-connector += "${PN}"
38 38
39do_install_append() { 39do_install_append() {
40 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 40 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
41 install -d ${D}${sysconfdir}/tmpfiles.d 41 install -d ${D}${sysconfdir}/tmpfiles.d
42 echo "d ${localstatedir}/log/ConsoleKit - - - -" \ 42 echo "d ${localstatedir}/log/ConsoleKit - - - -" \
43 > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf 43 > ${D}${sysconfdir}/tmpfiles.d/consolekit.conf
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap.inc
index fef700a..08f4cfed 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap.inc
@@ -6,7 +6,7 @@ LICENSE = "BSD | GPLv2"
6LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1" 6LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
7 7
8DEPENDS = "attr perl-native-runtime" 8DEPENDS = "attr perl-native-runtime"
9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 9DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
10# attr and pam are disabled by EXTRA_OEMAKE_class-native 10# attr and pam are disabled by EXTRA_OEMAKE_class-native
11DEPENDS_class-native = "perl-native-runtime" 11DEPENDS_class-native = "perl-native-runtime"
12 12
@@ -31,7 +31,7 @@ do_configure() {
31 31
32EXTRA_OEMAKE = " \ 32EXTRA_OEMAKE = " \
33 LIBATTR=yes \ 33 LIBATTR=yes \
34 PAM_CAP=${@base_contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \ 34 PAM_CAP=${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'yes', 'no', d)} \
35 INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \ 35 INDENT= SYSTEM_HEADERS=${STAGING_INCDIR} RAISE_SETFCAP=no \
36 lib=${@os.path.basename('${libdir}')} \ 36 lib=${@os.path.basename('${libdir}')} \
37" 37"
diff --git a/meta/recipes-support/libproxy/libproxy_0.4.11.bb b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
index aecb7b5..a53a197 100644
--- a/meta/recipes-support/libproxy/libproxy_0.4.11.bb
+++ b/meta/recipes-support/libproxy/libproxy_0.4.11.bb
@@ -29,7 +29,7 @@ do_configure_prepend() {
29} 29}
30 30
31python() { 31python() {
32 if base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or base_contains("DISTRO_FEATURES", "x11", "x", "", d) == "": 32 if bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "x", "", d) == "x" or bb.utils.contains("DISTRO_FEATURES", "x11", "x", "", d) == "":
33 d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no")) 33 d.setVar("EXTRA_OECMAKE", d.getVar("EXTRA_OECMAKE").replace("-DWITH_GNOME=yes", "-DWITH_GNOME=no"))
34 d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf")) 34 d.setVar("DEPENDS", " ".join(i for i in d.getVar("DEPENDS").split() if i != "gconf"))
35} 35}