summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-04-22 20:48:49 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-04-28 10:38:38 +0200
commit21f10c11f39020f9502d741c774a12d1aeb39499 (patch)
treefdc66c039950da89d82b6b7405ebfc50cbba693a
parent723b55f5c1f7df21dbcfa7cb2dcaecb10d886041 (diff)
downloadmeta-openembedded-21f10c11f39020f9502d741c774a12d1aeb39499.tar.gz
meta-oe: use bb.utils.contains() instead of base_contains()
base_contains() is a compatibility wrapper and may warn in the future, so replace all instances with bb.utils.contains(). Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb2
-rw-r--r--meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb2
-rw-r--r--meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb2
-rw-r--r--meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb2
-rw-r--r--meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb2
-rw-r--r--meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb2
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-basic.bb10
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-boot.bb2
-rw-r--r--meta-oe/recipes-devtools/ltrace/ltrace_git.bb2
-rw-r--r--meta-oe/recipes-extended/corosync/corosync_2.3.5.bb2
-rw-r--r--meta-oe/recipes-extended/dlm/dlm_4.0.2.bb2
-rw-r--r--meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb2
-rw-r--r--meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb2
-rw-r--r--meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb2
-rw-r--r--meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb4
-rw-r--r--meta-oe/recipes-extended/polkit/polkit_0.113.bb6
-rw-r--r--meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb4
-rw-r--r--meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb6
-rw-r--r--meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb6
-rw-r--r--meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb4
-rw-r--r--meta-oe/recipes-graphics/fbida/fbida_2.10.bb14
-rw-r--r--meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb2
-rw-r--r--meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb18
-rw-r--r--meta-oe/recipes-graphics/slim/slim_1.3.2.bb4
-rw-r--r--meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb8
-rw-r--r--meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb2
-rw-r--r--meta-oe/recipes-kernel/ktap/ktap.inc4
-rw-r--r--meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb2
-rw-r--r--meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb2
-rw-r--r--meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb4
-rw-r--r--meta-oe/recipes-support/emacs/emacs.inc4
-rw-r--r--meta-oe/recipes-support/espeak/espeak_1.37.bb2
-rw-r--r--meta-oe/recipes-support/fftw/fftwf_3.3.4.bb2
-rw-r--r--meta-oe/recipes-support/gradm/gradm_3.1.bb4
-rw-r--r--meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb6
-rw-r--r--meta-oe/recipes-support/libee/libee.inc2
-rw-r--r--meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb2
-rw-r--r--meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb2
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc4
-rw-r--r--meta-oe/recipes-support/openct/openct_0.6.20.bb4
-rw-r--r--meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb4
-rw-r--r--meta-oe/recipes-support/postgresql/postgresql.inc2
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng.inc6
-rw-r--r--meta-oe/recipes-support/udisks/udisks2_2.1.5.bb2
-rw-r--r--meta-oe/recipes-support/udisks/udisks_1.0.5.bb2
-rw-r--r--meta-oe/recipes-support/vim/vim_7.4.769.bb4
46 files changed, 89 insertions, 89 deletions
diff --git a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
index b7cc4162a..015d4463a 100644
--- a/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
+++ b/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb
@@ -37,7 +37,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
37 37
38#The CUSTOM_LDSCRIPTS doesn't work with the gold linker 38#The CUSTOM_LDSCRIPTS doesn't work with the gold linker
39do_configure() { 39do_configure() {
40 if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then 40 if [ "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
41 sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile 41 sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile
42 fi 42 fi
43 43
diff --git a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
index 24cd0b0ea..5459bf9cb 100644
--- a/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
+++ b/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb
@@ -46,7 +46,7 @@ do_install () {
46 46
47 echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ 47 echo "d root root 0755 ${localstatedir}/run/${BPN} none" \
48 > ${D}${sysconfdir}/default/volatiles/99_lmbench 48 > ${D}${sysconfdir}/default/volatiles/99_lmbench
49 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 49 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
50 install -d ${D}${sysconfdir}/tmpfiles.d 50 install -d ${D}${sysconfdir}/tmpfiles.d
51 echo "d /run/${BPN} - - - -" \ 51 echo "d /run/${BPN} - - - -" \
52 > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf 52 > ${D}${sysconfdir}/tmpfiles.d/lmbench.conf
diff --git a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
index acae8689d..cfd794de5 100644
--- a/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
+++ b/meta-oe/recipes-connectivity/gnokii/gnokii_0.6.31.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://www.gnokii.org/download/gnokii/gnokii-${PV}.tar.bz2"
8DEPENDS = "glib-2.0" 8DEPENDS = "glib-2.0"
9X11DEPENDS = " libxpm gtk+" 9X11DEPENDS = " libxpm gtk+"
10 10
11PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 11PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
12PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4" 12PACKAGECONFIG[bluez4] = "--enable-bluetooth,--disable-bluetooth,bluez4"
13PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical" 13PACKAGECONFIG[libical] = "--enable-libical,--disable-libical,libical"
14PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite" 14PACKAGECONFIG[pcsc-lite] = "--enable-libpcsclite,--disable-libpcsclite,pcsc-lite"
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
index 34c2969d4..1165b11e4 100644
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.13.2.bb
@@ -85,7 +85,7 @@ do_install_append() {
85 mkdir -p ${D}/${sysconfdir}/default/volatiles 85 mkdir -p ${D}/${sysconfdir}/default/volatiles
86 echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \ 86 echo "d root root 0755 ${localstatedir}/run/krb5kdc none" \
87 > ${D}${sysconfdir}/default/volatiles/87_krb5 87 > ${D}${sysconfdir}/default/volatiles/87_krb5
88 if ${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 88 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
89 install -d ${D}${sysconfdir}/tmpfiles.d 89 install -d ${D}${sysconfdir}/tmpfiles.d
90 echo "d /run/krb5kdc - - - -" \ 90 echo "d /run/krb5kdc - - - -" \
91 > ${D}${sysconfdir}/tmpfiles.d/krb5.conf 91 > ${D}${sysconfdir}/tmpfiles.d/krb5.conf
diff --git a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
index 857895b00..b5df8e0dd 100644
--- a/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
+++ b/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.5.bb
@@ -39,7 +39,7 @@ inherit autotools pkgconfig lib_package
39EXTRA_OECONF += "--disable-rpath" 39EXTRA_OECONF += "--disable-rpath"
40 40
41PACKAGECONFIG ?= "\ 41PACKAGECONFIG ?= "\
42 ${@base_contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \ 42 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile$', 'largefile', '', d)} \
43" 43"
44PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen" 44PACKAGECONFIG[doxygen] = "--enable-doxygen,--disable-doxygen"
45PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile" 45PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile"
diff --git a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb
index e55c37706..c2c4eaefa 100644
--- a/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb
+++ b/meta-oe/recipes-connectivity/zabbix/zabbix_2.4.7.bb
@@ -60,7 +60,7 @@ do_configure_prepend() {
60} 60}
61 61
62do_install_append() { 62do_install_append() {
63 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 63 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
64 install -d ${D}${systemd_unitdir}/system 64 install -d ${D}${systemd_unitdir}/system
65 install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/ 65 install -m 0644 ${WORKDIR}/zabbix-agent.service ${D}${systemd_unitdir}/system/
66 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service 66 sed -i -e 's#@SBINDIR@#${sbindir}#g' ${D}${systemd_unitdir}/system/zabbix-agent.service
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 4f2992cb6..21dd1deb6 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -42,12 +42,12 @@ RDEPENDS_${PN} = "\
42# 42#
43RRECOMMENDS_${PN} = "\ 43RRECOMMENDS_${PN} = "\
44 ${MACHINE_EXTRA_RRECOMMENDS} \ 44 ${MACHINE_EXTRA_RRECOMMENDS} \
45 ${@base_contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \ 45 ${@bb.utils.contains("MACHINE_FEATURES", "usbhost", "usbutils", "", d)} \
46 ${@base_contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \ 46 ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "alsa-utils-alsamixer", "", d)} \
47 ${@base_contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \ 47 ${@bb.utils.contains("MACHINE_FEATURES", "usbgadget", "kernel-module-g-ether kernel-module-g-serial kernel-module-g-mass-storage", "", d)} \
48 \ 48 \
49 ${@base_contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \ 49 ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth", "${BLUEZ}", "", d)} \
50 ${@base_contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \ 50 ${@bb.utils.contains("DISTRO_FEATURES", "wifi", "iw wpa-supplicant", "", d)} \
51 \ 51 \
52 tzdata \ 52 tzdata \
53 \ 53 \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index f50443d81..a542ae420 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -24,7 +24,7 @@ RDEPENDS_${PN} = "\
24 base-passwd \ 24 base-passwd \
25 busybox \ 25 busybox \
26 netbase \ 26 netbase \
27 ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ 27 ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \
28 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ 28 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
29" 29"
30 30
diff --git a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
index d8d037ed6..bc4e27166 100644
--- a/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
+++ b/meta-oe/recipes-devtools/ltrace/ltrace_git.bb
@@ -24,7 +24,7 @@ S = "${WORKDIR}/git"
24 24
25inherit autotools 25inherit autotools
26 26
27PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" 27PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
28PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind" 28PACKAGECONFIG[unwind] = "--with-libunwind,--without-libunwind,libunwind"
29PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" 29PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux"
30 30
diff --git a/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb b/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb
index 08c089385..508277e76 100644
--- a/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb
+++ b/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb
@@ -41,7 +41,7 @@ do_install_append() {
41 install -m 0644 ${S}/init/corosync.in ${D}${sysconfdir}/init.d/corosync 41 install -m 0644 ${S}/init/corosync.in ${D}${sysconfdir}/init.d/corosync
42 install -m 0644 ${S}/init/corosync-notifyd.in ${D}${sysconfdir}/init.d/corosync-notifyd 42 install -m 0644 ${S}/init/corosync-notifyd.in ${D}${sysconfdir}/init.d/corosync-notifyd
43 43
44 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 44 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
45 install -d ${D}${systemd_unitdir}/system 45 install -d ${D}${systemd_unitdir}/system
46 install -m 0644 ${S}/init/corosync.service.in ${D}${systemd_unitdir}/system/corosync.service 46 install -m 0644 ${S}/init/corosync.service.in ${D}${systemd_unitdir}/system/corosync.service
47 install -m 0644 ${S}/init/corosync-notifyd.service.in ${D}${systemd_unitdir}/system/corosync-notifyd.service 47 install -m 0644 ${S}/init/corosync-notifyd.service.in ${D}${systemd_unitdir}/system/corosync-notifyd.service
diff --git a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
index 560630c74..ff3730563 100644
--- a/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
+++ b/meta-oe/recipes-extended/dlm/dlm_4.0.2.bb
@@ -37,7 +37,7 @@ do_install_append (){
37 install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm 37 install -m 0644 ${S}/init/dlm.init ${D}${sysconfdir}/init.d/dlm
38 38
39 # install systemd unit files 39 # install systemd unit files
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}${systemd_unitdir}/system 41 install -d ${D}${systemd_unitdir}/system
42 install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system 42 install -m 0644 ${S}/init/dlm.service ${D}${systemd_unitdir}/system
43 fi 43 fi
diff --git a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
index 2582a7743..9b2ace9c4 100644
--- a/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
+++ b/meta-oe/recipes-extended/konkretcmpi/konkretcmpi-native_0.9.2.bb
@@ -16,7 +16,7 @@ SRCREV = "460e6421c16a8216d29ccd1b7490f814dab8b769"
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17
18inherit native cmake 18inherit native cmake
19LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 19LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
20 20
21EXTRA_OECMAKE = "-DWITH_PYTHON=ON \ 21EXTRA_OECMAKE = "-DWITH_PYTHON=ON \
22 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \ 22 ${@base_conditional("libdir", "/usr/lib64", "-DLIB_SUFFIX=64", "", d)} \
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
index 4761ef7e9..f57e9dfc6 100644
--- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
+++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb
@@ -7,7 +7,7 @@ PACKAGECONFIG ?= ""
7PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," 7PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render,"
8PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" 8PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid"
9 9
10LCD_DRIVERS_append = "${@base_contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" 10LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}"
11 11
12do_install_append () { 12do_install_append () {
13 # binaries 13 # binaries
diff --git a/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb b/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
index f74fb7781..604888874 100644
--- a/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
+++ b/meta-oe/recipes-extended/openlmi/openlmi-providers_0.6.0.bb
@@ -17,7 +17,7 @@ SRC_URI[md5sum] = "5904f23cf494946237cfbbdbe644a3cd"
17SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56" 17SRC_URI[sha256sum] = "e2b2fbeaec45a83905d0da3b87da83904d9cd94c1b86312f844587b3fff11f56"
18 18
19inherit cmake 19inherit cmake
20LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 20LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
21EXTRA_OECMAKE = " \ 21EXTRA_OECMAKE = " \
22 -DWITH-DEVASSISTANT=OFF \ 22 -DWITH-DEVASSISTANT=OFF \
23 -DWITH-JOURNALD=OFF \ 23 -DWITH-JOURNALD=OFF \
diff --git a/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb b/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb
index bdb7ced17..52b271c11 100644
--- a/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb
+++ b/meta-oe/recipes-extended/openwsman/openwsman_2.6.2.bb
@@ -29,7 +29,7 @@ inherit systemd cmake pkgconfig pythonnative perlnative
29SYSTEMD_SERVICE_${PN} = "openwsmand.service" 29SYSTEMD_SERVICE_${PN} = "openwsmand.service"
30SYSTEMD_AUTO_ENABLE = "disable" 30SYSTEMD_AUTO_ENABLE = "disable"
31 31
32LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}" 32LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd ", '', d)}"
33 33
34EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \ 34EXTRA_OECMAKE = "-DBUILD_BINDINGS=NO \
35 -DBUILD_LIBCIM=NO \ 35 -DBUILD_LIBCIM=NO \
@@ -50,7 +50,7 @@ do_install_append() {
50 install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand 50 install -m 755 ${B}/etc/init/openwsmand.sh ${D}/${sysconfdir}/init.d/openwsmand
51 ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand 51 ln -sf ${sysconfdir}/init.d/openwsmand ${D}/${sbindir}/rcopenwsmand
52 chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh 52 chmod 755 ${D}/${sysconfdir}/openwsman/owsmangencert.sh
53 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 53 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
54 install -d ${D}/${systemd_unitdir}/system 54 install -d ${D}/${systemd_unitdir}/system
55 install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system 55 install -m 644 ${WORKDIR}/openwsmand.service ${D}/${systemd_unitdir}/system
56 56
diff --git a/meta-oe/recipes-extended/polkit/polkit_0.113.bb b/meta-oe/recipes-extended/polkit/polkit_0.113.bb
index aab4f549d..fdd198a61 100644
--- a/meta-oe/recipes-extended/polkit/polkit_0.113.bb
+++ b/meta-oe/recipes-extended/polkit/polkit_0.113.bb
@@ -9,8 +9,8 @@ DEPENDS = "expat glib-2.0 intltool-native mozjs"
9 9
10inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection 10inherit autotools gtk-doc pkgconfig useradd systemd gobject-introspection
11 11
12PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ 12PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
13 ${@base_contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}" 13 ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','consolekit',d)}"
14 14
15PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam" 15PACKAGECONFIG[pam] = "--with-authfw=pam,--with-authfw=shadow,libpam,libpam"
16PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd" 16PACKAGECONFIG[systemd] = "--enable-libsystemd-login=yes --with-systemdsystemunitdir=${systemd_unitdir}/system/,--enable-libsystemd-login=no --with-systemdsystemunitdir=,systemd"
@@ -20,7 +20,7 @@ PACKAGECONFIG[consolekit] = ",,,consolekit"
20PAM_SRC_URI = "file://polkit-1_pam.patch" 20PAM_SRC_URI = "file://polkit-1_pam.patch"
21SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \ 21SRC_URI = "http://www.freedesktop.org/software/polkit/releases/polkit-${PV}.tar.gz \
22 file://0001-make-netgroup-support-configurable.patch \ 22 file://0001-make-netgroup-support-configurable.patch \
23 ${@base_contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \ 23 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '${PAM_SRC_URI}', '', d)} \
24" 24"
25SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf" 25SRC_URI[md5sum] = "4b77776c9e4f897dcfe03b2c34198edf"
26SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81" 26SRC_URI[sha256sum] = "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
diff --git a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
index 8cc4aaa58..a1121686c 100644
--- a/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
+++ b/meta-oe/recipes-extended/rarpd/rarpd_ss981107.bb
@@ -38,13 +38,13 @@ do_install() {
38 install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8 38 install -m 644 rarpd.8 ${D}${mandir}/man8/rarpd.8
39 install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers 39 install -m 644 ${WORKDIR}/ethers.sample ${D}${sysconfdir}/ethers
40 40
41 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 41 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
42 install -d ${D}${systemd_unitdir}/system 42 install -d ${D}${systemd_unitdir}/system
43 install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/ 43 install -m 0644 ${WORKDIR}/rarpd.service ${D}${systemd_unitdir}/system/
44 fi 44 fi
45} 45}
46 46
47inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)} 47inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','',d)}
48 48
49SYSTEMD_PACKAGES = "${PN}" 49SYSTEMD_PACKAGES = "${PN}"
50SYSTEMD_SERVICE_${PN} = "rarpd.service" 50SYSTEMD_SERVICE_${PN} = "rarpd.service"
diff --git a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
index 0f6b6cfe7..c1d923c75 100644
--- a/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
+++ b/meta-oe/recipes-extended/rsyslog/rsyslog_7.6.1.bb
@@ -41,9 +41,9 @@ EXTRA_OECONF += "--enable-cached-man-pages"
41PACKAGECONFIG ??= " \ 41PACKAGECONFIG ??= " \
42 zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \ 42 zlib rsyslogd rsyslogrt klog inet regexp uuid libgcrypt \
43 imdiag gnutls imfile \ 43 imdiag gnutls imfile \
44 ${@base_contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'snmp', 'snmp', '', d)} \
45 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
46 ${@base_contains('DISTRO_FEATURES', 'ptest', 'testbench ${VALGRIND}', '', d)} \ 46 ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench ${VALGRIND}', '', d)} \
47" 47"
48 48
49# default yes in configure 49# default yes in configure
diff --git a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
index efd4295c8..ed5382e39 100644
--- a/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
+++ b/meta-oe/recipes-extended/sblim-sfcb/sblim-sfcb_1.4.9.bb
@@ -25,13 +25,13 @@ SRC_URI[md5sum] = "28021cdabc73690a94f4f9d57254ce30"
25SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd" 25SRC_URI[sha256sum] = "634a67b2f7ac3b386a79160eb44413d618e33e4e7fc74ae68b0240484af149dd"
26 26
27inherit autotools 27inherit autotools
28inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} 28inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
29 29
30SYSTEMD_PACKAGES = "${PN}" 30SYSTEMD_PACKAGES = "${PN}"
31SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service" 31SYSTEMD_SERVICE_${PN} = "sblim-sfcb.service"
32SYSTEMD_AUTO_ENABLE = "enable" 32SYSTEMD_AUTO_ENABLE = "enable"
33 33
34LDFLAGS_append = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" 34LDFLAGS_append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}"
35 35
36EXTRA_OECONF = '--enable-debug \ 36EXTRA_OECONF = '--enable-debug \
37 --enable-ssl \ 37 --enable-ssl \
@@ -50,7 +50,7 @@ do_install() {
50 50
51 oe_runmake DESTDIR=${D} install 51 oe_runmake DESTDIR=${D} install
52 52
53 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 53 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
54 install -d ${D}${systemd_unitdir}/system 54 install -d ${D}${systemd_unitdir}/system
55 install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service 55 install -m 0644 ${WORKDIR}/sfcb.service ${D}${systemd_unitdir}/system/sblim-sfcb.service
56 fi 56 fi
diff --git a/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb b/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb
index 4e5187610..86e6d9ee6 100644
--- a/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb
+++ b/meta-oe/recipes-extended/smartmontools/smartmontools_6.4.bb
@@ -18,8 +18,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/smartmontools/smartmontools-${PV}.tar.gz \
18 file://smartd.service \ 18 file://smartd.service \
19 " 19 "
20 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \ 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'libcap-ng', 'libcap-ng', '', d)} \
22 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ 22 ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
23 " 23 "
24PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng" 24PACKAGECONFIG[libcap-ng] = "--with-libcap-ng=yes,--with-libcap-ng=no,libcap-ng"
25PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux" 25PACKAGECONFIG[selinux] = "--with-selinux=yes,--with-selinux=no,libselinux"
diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
index 8a4c083a4..8d3da69aa 100644
--- a/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
+++ b/meta-oe/recipes-graphics/fbida/fbida_2.10.bb
@@ -31,25 +31,25 @@ do_compile() {
31 31
32 # Be sure to respect preferences (force to "no") 32 # Be sure to respect preferences (force to "no")
33 # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} 33 # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH}
34 if [ -z "${@base_contains('PACKAGECONFIG', 'curl', 'curl', '', d)}" ]; then 34 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'curl', 'curl', '', d)}" ]; then
35 sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile 35 sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile
36 fi 36 fi
37 if [ -z "${@base_contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then 37 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'gif', 'gif', '', d)}" ]; then
38 sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile 38 sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile
39 fi 39 fi
40 if [ -z "${@base_contains('PACKAGECONFIG', 'png', 'png', '', d)}" ]; then 40 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'png', 'png', '', d)}" ]; then
41 sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile 41 sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile
42 fi 42 fi
43 if [ -z "${@base_contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then 43 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'tiff', 'tiff', '', d)}" ]; then
44 sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile 44 sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile
45 fi 45 fi
46 if [ -z "${@base_contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then 46 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'motif', 'motif', '', d)}" ]; then
47 sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile 47 sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile
48 fi 48 fi
49 if [ -z "${@base_contains('PACKAGECONFIG', 'webp', 'webp', '', d)}" ]; then 49 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'webp', 'webp', '', d)}" ]; then
50 sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile 50 sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile
51 fi 51 fi
52 if [ -z "${@base_contains('PACKAGECONFIG', 'lirc', 'lirc', '', d)}" ]; then 52 if [ -z "${@bb.utils.contains('PACKAGECONFIG', 'lirc', 'lirc', '', d)}" ]; then
53 sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile 53 sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile
54 fi 54 fi
55 55
diff --git a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
index a64791179..29ed4d994 100644
--- a/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
+++ b/meta-oe/recipes-graphics/gimp/gimp_2.8.14.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv3"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff lcms gegl poppler jasper bzip2 libgudev" 7DEPENDS = "babl gdk-pixbuf-native libart-lgpl gtk+ jpeg libpng libexif tiff lcms gegl poppler jasper bzip2 libgudev"
8DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}" 8DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxmu libxpm', '', d)}"
9 9
10inherit gnome gtk-doc 10inherit gnome gtk-doc
11 11
diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
index 227709251..407129dde 100644
--- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
+++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb
@@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5SRC_URI = " \ 5SRC_URI = " \
6 ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \ 6 ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar.xz \
7 file://lxdm.conf \ 7 file://lxdm.conf \
8 ${@base_contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \ 8 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://lxdm-pam file://lxdm-pam-debug', '', d)} \
9 ${@base_contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \ 9 ${@bb.utils.contains("DISTRO_TYPE", "debug", "", "file://0001-lxdm.conf.in-blacklist-root-for-release-images.patch",d)} \
10 file://0002-let-autotools-create-lxdm.conf.patch \ 10 file://0002-let-autotools-create-lxdm.conf.patch \
11" 11"
12SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" 12SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0"
@@ -15,10 +15,10 @@ SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93
15PE = "1" 15PE = "1"
16 16
17DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes" 17DEPENDS = "virtual/libintl intltool-native cairo dbus gdk-pixbuf glib-2.0 gtk+ virtual/libx11 libxcb pango iso-codes"
18DEPENDS += "${@base_contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}" 18DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "systemd", "", "consolekit", d)}"
19 19
20# combine oe-core way with angstrom DISTRO_TYPE 20# combine oe-core way with angstrom DISTRO_TYPE
21DISTRO_TYPE ?= "${@base_contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}" 21DISTRO_TYPE ?= "${@bb.utils.contains("IMAGE_FEATURES", "debug-tweaks", "debug", "",d)}"
22 22
23inherit autotools pkgconfig gettext systemd distro_features_check 23inherit autotools pkgconfig gettext systemd distro_features_check
24# depends on virtual/libx11 24# depends on virtual/libx11
@@ -27,8 +27,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
27CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr " 27CFLAGS_append = " -fno-builtin-fork -fno-builtin-memset -fno-builtin-strstr "
28 28
29EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \ 29EXTRA_OECONF += "--enable-gtk3=no --enable-password=yes --with-x -with-xconn=xcb \
30 ${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \ 30 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/ --disable-consolekit', '--without-systemdsystemunitdir', d)} \
31 ${@base_contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', '--without-pam', d)} \
32" 32"
33 33
34do_configure_prepend() { 34do_configure_prepend() {
@@ -48,11 +48,11 @@ do_compile_append() {
48do_install_append() { 48do_install_append() {
49 install -d ${D}${localstatedir}/lib/lxdm 49 install -d ${D}${localstatedir}/lib/lxdm
50 install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm 50 install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm
51 if ${@base_contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then 51 if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then
52 # ArchLinux version of pam config has the following advantages: 52 # ArchLinux version of pam config has the following advantages:
53 # * simple setup of passwordless login 53 # * simple setup of passwordless login
54 # * in XFCE powerdown/restart enabled in logoff dialog 54 # * in XFCE powerdown/restart enabled in logoff dialog
55 install -m 644 ${WORKDIR}/${@base_contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm 55 install -m 644 ${WORKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm
56 fi 56 fi
57} 57}
58 58
@@ -70,7 +70,7 @@ done
70sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf 70sed -i "s:last_langs=.*$:last_langs=$langs:g" $D${localstatedir}/lib/lxdm/lxdm.conf
71} 71}
72 72
73RDEPENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk" 73RDEPENDS_${PN} = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-loginuid', '', d)} setxkbmap bash librsvg-gtk"
74 74
75RPROVIDES_${PN} += "${PN}-systemd" 75RPROVIDES_${PN} += "${PN}-systemd"
76RREPLACES_${PN} += "${PN}-systemd" 76RREPLACES_${PN} += "${PN}-systemd"
diff --git a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
index 1ae8dbbc6..71359e012 100644
--- a/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
+++ b/meta-oe/recipes-graphics/slim/slim_1.3.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5 5
6PR = "r1" 6PR = "r1"
7 7
8DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 8DEPENDS = "virtual/libx11 libxmu libpng jpeg freetype sessreg ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
9 9
10SRC_URI = " \ 10SRC_URI = " \
11 http://download.berlios.de/${BPN}/${BP}.tar.gz \ 11 http://download.berlios.de/${BPN}/${BP}.tar.gz \
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "f1560125005f253b9b88220598fed7a9575ef405716862c6ca3fcc72db
28 28
29 29
30EXTRA_OEMAKE += " \ 30EXTRA_OEMAKE += " \
31 USE_PAM=${@base_contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \ 31 USE_PAM=${@bb.utils.contains('DISTRO_FEATURES', 'pam', '1', '0', d)} \
32 PREFIX=${prefix} \ 32 PREFIX=${prefix} \
33 CFGDIR=${sysconfdir} \ 33 CFGDIR=${sysconfdir} \
34 MANDIR=${mandir} \ 34 MANDIR=${mandir} \
diff --git a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
index 337cde426..e5bea97d9 100644
--- a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
+++ b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.38.bb
@@ -16,11 +16,11 @@ SRC_URI[sha256sum] = "f6f4876a4dabe6a37c270c20bb9e141e38fb50e0bba200e1b9d0470e5e
16 16
17inherit allarch fontcache 17inherit allarch fontcache
18 18
19PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 19PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
20PACKAGECONFIG[x11] = "" 20PACKAGECONFIG[x11] = ""
21 21
22# Don't use font cache mecanism for console packages 22# Don't use font cache mecanism for console packages
23FONT_PACKAGES = "${@base_contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}" 23FONT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'x11', '${PN}-pcf', '', d)}"
24 24
25# Hand made configure script. Don't need oe_runconf 25# Hand made configure script. Don't need oe_runconf
26do_configure() { 26do_configure() {
@@ -32,11 +32,11 @@ do_configure() {
32} 32}
33 33
34do_compile() { 34do_compile() {
35 oe_runmake DESTDIR=${D} psf txt ${@base_contains('PACKAGECONFIG', 'x11', 'pcf', '', d)} 35 oe_runmake DESTDIR=${D} psf txt ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'pcf', '', d)}
36} 36}
37 37
38do_install() { 38do_install() {
39 oe_runmake DESTDIR=${D} install-psf install-acm ${@base_contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)} 39 oe_runmake DESTDIR=${D} install-psf install-acm ${@bb.utils.contains('PACKAGECONFIG', 'x11', 'install-pcf', '', d)}
40} 40}
41 41
42PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf" 42PACKAGES += "${PN}-consolefonts ${PN}-consoletrans ${PN}-pcf"
diff --git a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
index b29d0759a..95a07d16c 100644
--- a/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
+++ b/meta-oe/recipes-graphics/xserver-nodm-init/xserver-nodm-init_2.0.bb
@@ -24,7 +24,7 @@ do_install() {
24 24
25 install -d ${D}${sysconfdir}/default 25 install -d ${D}${sysconfdir}/default
26 26
27 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 27 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
28 install -d ${D}${systemd_unitdir}/system 28 install -d ${D}${systemd_unitdir}/system
29 install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm 29 install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm
30 install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system 30 install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system
diff --git a/meta-oe/recipes-kernel/ktap/ktap.inc b/meta-oe/recipes-kernel/ktap/ktap.inc
index e2e498f9f..c214a020d 100644
--- a/meta-oe/recipes-kernel/ktap/ktap.inc
+++ b/meta-oe/recipes-kernel/ktap/ktap.inc
@@ -21,6 +21,6 @@ PACKAGECONFIG[libelf] = ",,elfutils"
21PACKAGECONFIG ?= "libelf" 21PACKAGECONFIG ?= "libelf"
22 22
23EXTRA_OEMAKE = " \ 23EXTRA_OEMAKE = " \
24 ${@base_contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \ 24 ${@bb.utils.contains('PACKAGECONFIG', 'libelf', '', 'NO_LIBELF=1', d)} \
25 ${@base_contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \ 25 ${@bb.utils.contains('PACKAGECONFIG', 'ffi', 'FFI=1', '', d)} \
26" 26"
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 191d4b98c..145497a46 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -14,7 +14,7 @@ RCONFLICTS_${PN} = "mplayer"
14REQUIRED_DISTRO_FEATURES = "x11" 14REQUIRED_DISTRO_FEATURES = "x11"
15 15
16# because it depends on libpostproc/libav which has commercial flag 16# because it depends on libpostproc/libav which has commercial flag
17LICENSE_FLAGS = "${@base_contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}" 17LICENSE_FLAGS = "${@bb.utils.contains('PACKAGECONFIG', 'postproc', 'commercial', '', d)}"
18 18
19LICENSE = "GPLv3" 19LICENSE = "GPLv3"
20LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" 20LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
diff --git a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
index a5c802c09..75a42a20d 100644
--- a/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
+++ b/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.6.2.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=48da9957849056017dc568bbc43d8975 \
5PROVIDES = "libv4l media-ctl" 5PROVIDES = "libv4l media-ctl"
6 6
7DEPENDS = "jpeg \ 7DEPENDS = "jpeg \
8 ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" 8 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
9 9
10inherit autotools gettext pkgconfig 10inherit autotools gettext pkgconfig
11 11
diff --git a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
index a30059568..aef9b138a 100644
--- a/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
+++ b/meta-oe/recipes-navigation/gpsd/gpsd_3.14.bb
@@ -30,12 +30,12 @@ inherit scons update-rc.d python-dir pythonnative systemd bluetooth
30INITSCRIPT_NAME = "gpsd" 30INITSCRIPT_NAME = "gpsd"
31INITSCRIPT_PARAMS = "defaults 35" 31INITSCRIPT_PARAMS = "defaults 35"
32 32
33SYSTEMD_OESCONS = "${@base_contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}" 33SYSTEMD_OESCONS = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false',d)}"
34 34
35export STAGING_INCDIR 35export STAGING_INCDIR
36export STAGING_LIBDIR 36export STAGING_LIBDIR
37 37
38PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}" 38PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)}"
39PACKAGECONFIG[bluez] = "bluez='true',bluez='false',${BLUEZ}" 39PACKAGECONFIG[bluez] = "bluez='true',bluez='false',${BLUEZ}"
40PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free" 40PACKAGECONFIG[qt] = "qt='yes',qt='no',qt4-x11-free"
41EXTRA_OESCONS = " \ 41EXTRA_OESCONS = " \
diff --git a/meta-oe/recipes-support/emacs/emacs.inc b/meta-oe/recipes-support/emacs/emacs.inc
index e706b18c9..ffb5c50c7 100644
--- a/meta-oe/recipes-support/emacs/emacs.inc
+++ b/meta-oe/recipes-support/emacs/emacs.inc
@@ -18,7 +18,7 @@ X11DEPENDS = " \
18 18
19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} " 19EXTRA_OECONF = "--without-sound --with-crt-dir=${STAGING_LIBDIR} "
20 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
22PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}" 22PACKAGECONFIG[x11] = "--with-x-toolkit=gtk,--without-x --without-dbus,${X11DEPENDS}"
23 23
24 24
@@ -86,7 +86,7 @@ do_compile_prepend() {
86 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \ 86 ${STAGING_DIR_TARGET}/${base_libdir}/libgcc_s.so.* \
87 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/ 87 ${STAGING_DIR_TARGET}/${base_libdir}/libpthread* $treedir/${base_libdir}/
88 88
89 if [ ! -z "${@base_contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then 89 if [ ! -z "${@bb.utils.contains('PACKAGECONFIG', 'x11', 'x11', '', d)}" ] ; then
90 echo "X11 build enabled" 90 echo "X11 build enabled"
91 # copy only as much stuff as we need 91 # copy only as much stuff as we need
92 # before: 5.5G ../../qemu-treedir/ 92 # before: 5.5G ../../qemu-treedir/
diff --git a/meta-oe/recipes-support/espeak/espeak_1.37.bb b/meta-oe/recipes-support/espeak/espeak_1.37.bb
index cf05d2645..273fe340e 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.37.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.37.bb
@@ -1,7 +1,7 @@
1require espeak.inc 1require espeak.inc
2inherit siteinfo 2inherit siteinfo
3 3
4EXTRA_PHONEMES = '${@base_contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}' 4EXTRA_PHONEMES = '${@bb.utils.contains("SITEINFO_ENDIANNESS", "be", "espeak-data (= ${PV})", "", d)}'
5RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}" 5RDEPENDS_${PN} = "portaudio-v19 ${EXTRA_PHONEMES}"
6 6
7SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02" 7SRC_URI[md5sum] = "5c7b292d0537232868b4ac1317d76c02"
diff --git a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
index 7a4fbac8c..4a659867d 100644
--- a/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
+++ b/meta-oe/recipes-support/fftw/fftwf_3.3.4.bb
@@ -4,7 +4,7 @@ require fftw.inc
4EXCLUDE_FROM_WORLD = "1" 4EXCLUDE_FROM_WORLD = "1"
5 5
6EXTRA_OECONF += "--enable-single \ 6EXTRA_OECONF += "--enable-single \
7 ${@base_contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \ 7 ${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)} \
8" 8"
9 9
10SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3" 10SRC_URI[md5sum] = "2edab8c06b24feeb3b82bbb3ebf3e7b3"
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1.bb b/meta-oe/recipes-support/gradm/gradm_3.1.bb
index fe36fba58..252b19de2 100644
--- a/meta-oe/recipes-support/gradm/gradm_3.1.bb
+++ b/meta-oe/recipes-support/gradm/gradm_3.1.bb
@@ -9,7 +9,7 @@ HOMEPAGE = "http://grsecurity.net/index.php"
9SECTION = "admin" 9SECTION = "admin"
10LICENSE = "GPL-2.0" 10LICENSE = "GPL-2.0"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b"
12DEPENDS = "flex-native bison-native ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" 12DEPENDS = "flex-native bison-native ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
13 13
14SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \ 14SRC_URI = "http://grsecurity.net/stable/${BP}-201507191652.tar.gz \
15 file://0001-Makefile-remove-strip.patch" 15 file://0001-Makefile-remove-strip.patch"
@@ -26,7 +26,7 @@ do_compile() {
26 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \ 26 'LLEX=${STAGING_BINDIR_NATIVE}/lex' \
27 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \ 27 'FLEX=${STAGING_BINDIR_NATIVE}/flex' \
28 'BISON=${STAGING_BINDIR_NATIVE}/bison' \ 28 'BISON=${STAGING_BINDIR_NATIVE}/bison' \
29 ${@base_contains('DISTRO_FEATURES', 'pam', ' ', 'nopam', d)} 29 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', ' ', 'nopam', d)}
30} 30}
31 31
32do_install() { 32do_install() {
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
index 26638c3b9..f47377500 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
@@ -22,9 +22,9 @@ EXTRA_OECONF = "\
22 --disable-lynx \ 22 --disable-lynx \
23" 23"
24 24
25PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES','alsa','alsa','',d)} \ 25PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES','alsa','alsa','',d)} \
26 ${@base_contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \ 26 ${@bb.utils.contains('DISTRO_FEATURES','pulseaudio','pulseaudio','',d)} \
27 ${@base_contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \ 27 ${@bb.utils.contains('DISTRO_FEATURES','x11','gtk gtk3','',d)} \
28" 28"
29PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib" 29PACKAGECONFIG[alsa] = "--enable-alsa, --disable-alsa, alsa-lib"
30PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio" 30PACKAGECONFIG[pulseaudio] = "--enable-pulse, --disable-pulse, pulseaudio"
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc
index 5b552ca2a..256fa053b 100644
--- a/meta-oe/recipes-support/libee/libee.inc
+++ b/meta-oe/recipes-support/libee/libee.inc
@@ -18,7 +18,7 @@ inherit autotools ptest pkgconfig
18 18
19DEPENDS += "libestr" 19DEPENDS += "libestr"
20 20
21PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" 21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}"
22 22
23PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," 23PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
24PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," 24PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,,"
diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb
index e3c833bf4..a4a0f3883 100644
--- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb
+++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.34.bb
@@ -16,7 +16,7 @@ EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../ --disable-
16 16
17PACKAGECONFIG ?= "curl" 17PACKAGECONFIG ?= "curl"
18PACKAGECONFIG_append_class-target = "\ 18PACKAGECONFIG_append_class-target = "\
19 ${@base_contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ 19 ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \
20" 20"
21PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," 21PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,,"
22PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," 22PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl,"
diff --git a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb
index 62ea13176..857a57be5 100644
--- a/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb
+++ b/meta-oe/recipes-support/lm_sensors/lmsensors_3.4.0.bb
@@ -55,7 +55,7 @@ do_install() {
55 install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord 55 install -m 0755 ${WORKDIR}/sensord.init ${D}${sysconfdir}/init.d/sensord
56 56
57 # Insall sensord service script 57 # Insall sensord service script
58 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 58 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
59 install -d ${D}${systemd_unitdir}/system 59 install -d ${D}${systemd_unitdir}/system
60 install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system 60 install -m 0644 ${S}/prog/init/*.service ${D}${systemd_unitdir}/system
61 fi 61 fi
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index a8d44daea..3a5e1c46a 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -17,7 +17,7 @@ S = "${WORKDIR}/LVM2.${PV}"
17 17
18inherit autotools-brokensep pkgconfig systemd 18inherit autotools-brokensep pkgconfig systemd
19 19
20PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" 20PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
21 21
22PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" 22PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
23PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux" 23PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux"
@@ -43,7 +43,7 @@ do_install_append() {
43 # Install machine specific configuration file 43 # Install machine specific configuration file
44 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf 44 install -m 0644 ${WORKDIR}/lvm.conf ${D}${sysconfdir}/lvm/lvm.conf
45 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf 45 sed -i -e 's:@libdir@:${libdir}:g' ${D}${sysconfdir}/lvm/lvm.conf
46 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 46 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
47 oe_runmake 'DESTDIR=${D}' install install_systemd_units 47 oe_runmake 'DESTDIR=${D}' install install_systemd_units
48 sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service 48 sed -i -e 's:/usr/bin/true:${base_bindir}/true:g' ${D}${systemd_system_unitdir}/blk-availability.service
49 else 49 else
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb
index 319784550..bf1ff570b 100644
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb
@@ -24,7 +24,7 @@ SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d
24LICENSE = "LGPLv2+" 24LICENSE = "LGPLv2+"
25LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" 25LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
26 26
27inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} 27inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
28SYSTEMD_SERVICE_${PN} += "openct.service " 28SYSTEMD_SERVICE_${PN} += "openct.service "
29SYSTEMD_AUTO_ENABLE = "enable" 29SYSTEMD_AUTO_ENABLE = "enable"
30 30
@@ -73,7 +73,7 @@ do_install () {
73 install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct 73 install -Dpm 755 ${WORKDIR}/openct.init ${D}/etc/init.d/openct
74 install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct 74 install -Dpm 644 ${WORKDIR}/openct.sysconfig ${D}/etc/sysconfig/openct
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 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system 78 install -m 644 ${WORKDIR}/openct.service ${D}/${systemd_unitdir}/system
79 fi 79 fi
diff --git a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb
index 1b186329c..ed8ef267c 100644
--- a/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb
+++ b/meta-oe/recipes-support/openwbem/openwbem_3.2.3.bb
@@ -64,7 +64,7 @@ do_install() {
64 64
65 # fix up hardcoded paths 65 # fix up hardcoded paths
66 sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service 66 sed -i -e 's,/usr/sbin/,${sbindir}/,' ${WORKDIR}/owcimomd.service
67 if ${@base_contains('DISTRO_FEATURES','systemd','true','false',d)}; then 67 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
68 install -d ${D}/${systemd_unitdir}/system 68 install -d ${D}/${systemd_unitdir}/system
69 install -m 644 ${WORKDIR}/owcimomd.service ${D}/${systemd_unitdir}/system 69 install -m 644 ${WORKDIR}/owcimomd.service ${D}/${systemd_unitdir}/system
70 install -m 755 ${WORKDIR}/checkserverkey ${D}${sysconfdir}/openwbem/ 70 install -m 755 ${WORKDIR}/checkserverkey ${D}${sysconfdir}/openwbem/
@@ -93,7 +93,7 @@ do_install() {
93 touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock} 93 touch ${D}/var/lib/openwbem/{classassociation,instances,instassociation,namespaces,schema}.{dat,ndx,lock}
94} 94}
95 95
96inherit ${@base_contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)} 96inherit ${@bb.utils.contains('VIRTUAL-RUNTIME_init_manager','systemd','systemd','', d)}
97SYSTEMD_SERVICE_${PN} = "owcimomd.service" 97SYSTEMD_SERVICE_${PN} = "owcimomd.service"
98SYSTEMD_AUTO_ENABLE = "disable" 98SYSTEMD_AUTO_ENABLE = "disable"
99FILES_${PN} += " \ 99FILES_${PN} += " \
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc
index 806c63873..288a2d183 100644
--- a/meta-oe/recipes-support/postgresql/postgresql.inc
+++ b/meta-oe/recipes-support/postgresql/postgresql.inc
@@ -55,7 +55,7 @@ pkg_postinst_${PN} () {
55 fi 55 fi
56} 56}
57 57
58enable_pam = "${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" 58enable_pam = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
59PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl" 59PACKAGECONFIG ??= "${enable_pam} openssl python uuid libxml tcl nls libxml perl"
60PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam," 60PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam,"
61PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl," 61PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl,"
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
index ed41f0199..382dc5e30 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng.inc
@@ -41,8 +41,8 @@ CONFIG_TLS = "--enable-thread-tls"
41CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}" 41CONFIG_TLS_arm = "${@base_conditional( "DEBUG_BUILD", "1", " --disable-thread-tls", " --enable-thread-tls", d )}"
42 42
43PACKAGECONFIG ??= "openssl \ 43PACKAGECONFIG ??= "openssl \
44 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \ 44 ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)} \
45 ${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ 45 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
46" 46"
47PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl," 47PACKAGECONFIG[openssl] = "--enable-ssl,--disable-ssl,openssl,"
48PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,," 48PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,,"
@@ -57,7 +57,7 @@ PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wra
57PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," 57PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip,"
58 58
59do_configure_prepend() { 59do_configure_prepend() {
60 eval "${@base_contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}" 60 eval "${@bb.utils.contains('DISTRO_FEATURES', 'largefile', '', 'sed -i -e "s/-D_LARGEFILE_SOURCE//" -e "s/-D_FILE_OFFSET_BITS=64//" ${S}/configure.in', d)}"
61} 61}
62 62
63do_install_append() { 63do_install_append() {
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
index 72db88687..f365cfaaf 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.1.5.bb
@@ -3,7 +3,7 @@ LICENSE = "GPLv2+ & LGPLv2+"
3LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43" 3LIC_FILES_CHKSUM = "file://COPYING;md5=dd79f6dbbffdbc8e86b086a8f0c0ef43"
4 4
5DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native" 5DEPENDS = "acl libatasmart polkit libgudev dbus-glib glib-2.0 intltool-native gnome-common-native"
6DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 6DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
7 7
8RDEPENDS_${PN} = "acl" 8RDEPENDS_${PN} = "acl"
9 9
diff --git a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
index 8ddc20dab..eec69333d 100644
--- a/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
+++ b/meta-oe/recipes-support/udisks/udisks_1.0.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73d83aebe7e4b62346afde80e0e94273"
5DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2" 5DEPENDS = "libatasmart sg3-utils polkit libgudev dbus-glib glib-2.0 intltool-native lvm2"
6# optional dependencies: device-mapper parted 6# optional dependencies: device-mapper parted
7 7
8DEPENDS += "${@base_contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" 8DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
9 9
10SRC_URI = " \ 10SRC_URI = " \
11 http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \ 11 http://hal.freedesktop.org/releases/${BPN}-${PV}.tar.gz;name=${BPN} \
diff --git a/meta-oe/recipes-support/vim/vim_7.4.769.bb b/meta-oe/recipes-support/vim/vim_7.4.769.bb
index c257d9057..08e5027a8 100644
--- a/meta-oe/recipes-support/vim/vim_7.4.769.bb
+++ b/meta-oe/recipes-support/vim/vim_7.4.769.bb
@@ -32,8 +32,8 @@ do_configure () {
32 32
33#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny 33#Available PACKAGECONFIG options are gtkgui, acl, x11, tiny
34PACKAGECONFIG ??= "" 34PACKAGECONFIG ??= ""
35PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}" 35PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'acl', 'acl', '', d)}"
36PACKAGECONFIG += "${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}" 36PACKAGECONFIG += "${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)}"
37 37
38PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+," 38PACKAGECONFIG[gtkgui] = "--enable-gtk2-test --enable-gui=gtk2,--enable-gui=no,gtk+,"
39PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl," 39PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl,"