diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/recipes-core/busybox | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/busybox')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 14 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.24.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_git.bb | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index b2f1960226..1f4a48c8cf 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -331,21 +331,21 @@ ALTERNATIVE_LINK_NAME[syslog-conf] = "${sysconfdir}/syslog.conf" | |||
331 | 331 | ||
332 | python () { | 332 | python () { |
333 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): | 333 | if bb.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d): |
334 | pn = d.getVar('PN', True) | 334 | pn = d.getVar('PN') |
335 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init') | 335 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-init') |
336 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir', True))) | 336 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-init', '%s/init.d/syslog' % (d.getVar('sysconfdir'))) |
337 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) | 337 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-init', '%s/init.d/syslog.%s' % (d.getVar('sysconfdir'), d.getVar('BPN'))) |
338 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-startup-conf') | 338 | d.appendVar('ALTERNATIVE_%s-syslog' % (pn), ' syslog-startup-conf') |
339 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-startup-conf', '%s/syslog-startup.conf' % (d.getVar('sysconfdir', True))) | 339 | d.setVarFlag('ALTERNATIVE_LINK_NAME', 'syslog-startup-conf', '%s/syslog-startup.conf' % (d.getVar('sysconfdir'))) |
340 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-startup-conf', '%s/syslog-startup.conf.%s' % (d.getVar('sysconfdir', True), d.getVar('BPN', True))) | 340 | d.setVarFlag('ALTERNATIVE_TARGET', 'syslog-startup-conf', '%s/syslog-startup.conf.%s' % (d.getVar('sysconfdir'), d.getVar('BPN'))) |
341 | } | 341 | } |
342 | 342 | ||
343 | python do_package_prepend () { | 343 | python do_package_prepend () { |
344 | # We need to load the full set of busybox provides from the /etc/busybox.links | 344 | # We need to load the full set of busybox provides from the /etc/busybox.links |
345 | # Use this to see the update-alternatives with the right information | 345 | # Use this to see the update-alternatives with the right information |
346 | 346 | ||
347 | dvar = d.getVar('D', True) | 347 | dvar = d.getVar('D') |
348 | pn = d.getVar('PN', True) | 348 | pn = d.getVar('PN') |
349 | def set_alternative_vars(links, target): | 349 | def set_alternative_vars(links, target): |
350 | links = d.expand(links) | 350 | links = d.expand(links) |
351 | target = d.expand(target) | 351 | target = d.expand(target) |
diff --git a/meta/recipes-core/busybox/busybox_1.24.1.bb b/meta/recipes-core/busybox/busybox_1.24.1.bb index c35cba3222..afb69d13e6 100644 --- a/meta/recipes-core/busybox/busybox_1.24.1.bb +++ b/meta/recipes-core/busybox/busybox_1.24.1.bb | |||
@@ -38,8 +38,8 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | |||
38 | file://sha256sum.cfg \ | 38 | file://sha256sum.cfg \ |
39 | file://getopts.cfg \ | 39 | file://getopts.cfg \ |
40 | file://resize.cfg \ | 40 | file://resize.cfg \ |
41 | ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'busybox')]} \ | 41 | ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ |
42 | ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) == 'busybox-mdev')]} \ | 42 | ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ |
43 | file://inittab \ | 43 | file://inittab \ |
44 | file://rcS \ | 44 | file://rcS \ |
45 | file://rcK \ | 45 | file://rcK \ |
diff --git a/meta/recipes-core/busybox/busybox_git.bb b/meta/recipes-core/busybox/busybox_git.bb index c29b894349..c2ee3e6c4b 100644 --- a/meta/recipes-core/busybox/busybox_git.bb +++ b/meta/recipes-core/busybox/busybox_git.bb | |||
@@ -40,8 +40,8 @@ SRC_URI = "git://busybox.net/busybox.git \ | |||
40 | file://sha256sum.cfg \ | 40 | file://sha256sum.cfg \ |
41 | file://getopts.cfg \ | 41 | file://getopts.cfg \ |
42 | file://resize.cfg \ | 42 | file://resize.cfg \ |
43 | ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager', True) == 'busybox')]} \ | 43 | ${@["", "file://init.cfg"][(d.getVar('VIRTUAL-RUNTIME_init_manager') == 'busybox')]} \ |
44 | ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager', True) == 'busybox-mdev')]} \ | 44 | ${@["", "file://mdev.cfg"][(d.getVar('VIRTUAL-RUNTIME_dev_manager') == 'busybox-mdev')]} \ |
45 | file://inittab \ | 45 | file://inittab \ |
46 | file://rcS \ | 46 | file://rcS \ |
47 | file://rcK \ | 47 | file://rcK \ |