diff options
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 26 |
1 files changed, 13 insertions, 13 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 |
61 | def features_to_busybox_settings(d): | 61 | def 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 | ' |
85 | OE_FEATURES := "${@features_to_busybox_conf(d)}" | 85 | OE_FEATURES := "${@features_to_busybox_conf(d)}" |
86 | OE_DEL := "${@features_to_busybox_del(d)}" | 86 | OE_DEL := "${@features_to_busybox_del(d)}" |
87 | DO_IPv4 := "${@base_contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}" | 87 | DO_IPv4 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv4', 1, 0, d)}" |
88 | DO_IPv6 := "${@base_contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}" | 88 | DO_IPv6 := "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 1, 0, d)}" |
89 | 89 | ||
90 | python () { | 90 | python () { |
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" | |||
299 | ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" | 299 | ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" |
300 | 300 | ||
301 | python () { | 301 | python () { |
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))) |