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/classes/live-vm-common.bbclass | |
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/classes/live-vm-common.bbclass')
-rw-r--r-- | meta/classes/live-vm-common.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass index 734697f9e6..27b137dec6 100644 --- a/meta/classes/live-vm-common.bbclass +++ b/meta/classes/live-vm-common.bbclass | |||
@@ -4,11 +4,11 @@ def set_live_vm_vars(d, suffix): | |||
4 | vars = ['GRUB_CFG', 'SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] | 4 | vars = ['GRUB_CFG', 'SYSLINUX_CFG', 'ROOT', 'LABELS', 'INITRD'] |
5 | for var in vars: | 5 | for var in vars: |
6 | var_with_suffix = var + '_' + suffix | 6 | var_with_suffix = var + '_' + suffix |
7 | if d.getVar(var, True): | 7 | if d.getVar(var): |
8 | bb.warn('Found potential conflicted var %s, please use %s rather than %s' % \ | 8 | bb.warn('Found potential conflicted var %s, please use %s rather than %s' % \ |
9 | (var, var_with_suffix, var)) | 9 | (var, var_with_suffix, var)) |
10 | elif d.getVar(var_with_suffix, True): | 10 | elif d.getVar(var_with_suffix): |
11 | d.setVar(var, d.getVar(var_with_suffix, True)) | 11 | d.setVar(var, d.getVar(var_with_suffix)) |
12 | 12 | ||
13 | 13 | ||
14 | EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" | 14 | EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" |
@@ -25,7 +25,7 @@ def pcbios(d): | |||
25 | return pcbios | 25 | return pcbios |
26 | 26 | ||
27 | PCBIOS = "${@pcbios(d)}" | 27 | PCBIOS = "${@pcbios(d)}" |
28 | PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS', True) == '1']}" | 28 | PCBIOS_CLASS = "${@['','syslinux'][d.getVar('PCBIOS') == '1']}" |
29 | 29 | ||
30 | inherit ${EFI_CLASS} | 30 | inherit ${EFI_CLASS} |
31 | inherit ${PCBIOS_CLASS} | 31 | inherit ${PCBIOS_CLASS} |