summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core')
-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
18 files changed, 145 insertions, 145 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index e59afe67bc..0c1969c890 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 338aae3d52..b9249146a9 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 ba3a0a0228..8f378145a9 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 bc260defe0..9ea0f4d374 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 8d348f8f25..44ee5a6b89 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 40ed9d261d..5a7be492b7 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 0432758417..259e752858 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 04c5d9a237..5008cf2931 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 cb07665d23..4d2726287c 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 e8a5b78168..5e0d3778f8 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 998a2d39b2..265b906d24 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 76b0b585fb..69f85666aa 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 368c318f01..16f3a510d8 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 1154bc05b5..c8bc362242 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 80f3031ff5..7832c89d23 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 952fbd0d1a..c7667540c9 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 278de9fd56..ec595bee08 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 ad7aac7900..c2a3cf7104 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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-04 17:31:01 +0000