mirror of
https://git.yoctoproject.org/poky
synced 2026-04-26 18:32:13 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
d5e67725ac
commit
c4e2c59088
@@ -63,8 +63,8 @@ efi_hddimg_populate() {
|
||||
}
|
||||
|
||||
python build_efi_cfg() {
|
||||
s = d.getVar("S", True)
|
||||
labels = d.getVar('LABELS', True)
|
||||
s = d.getVar("S")
|
||||
labels = d.getVar('LABELS')
|
||||
if not labels:
|
||||
bb.debug(1, "LABELS not defined, nothing to do")
|
||||
return
|
||||
@@ -73,7 +73,7 @@ python build_efi_cfg() {
|
||||
bb.debug(1, "No labels, nothing to do")
|
||||
return
|
||||
|
||||
cfile = d.getVar('SYSTEMD_BOOT_CFG', True)
|
||||
cfile = d.getVar('SYSTEMD_BOOT_CFG')
|
||||
try:
|
||||
cfgfile = open(cfile, 'w')
|
||||
except OSError:
|
||||
@@ -81,7 +81,7 @@ python build_efi_cfg() {
|
||||
|
||||
cfgfile.write('# Automatically created by OE\n')
|
||||
cfgfile.write('default %s\n' % (labels.split()[0]))
|
||||
timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT', True)
|
||||
timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT')
|
||||
if timeout:
|
||||
cfgfile.write('timeout %s\n' % timeout)
|
||||
else:
|
||||
@@ -91,7 +91,7 @@ python build_efi_cfg() {
|
||||
for label in labels.split():
|
||||
localdata = d.createCopy()
|
||||
|
||||
overrides = localdata.getVar('OVERRIDES', True)
|
||||
overrides = localdata.getVar('OVERRIDES')
|
||||
if not overrides:
|
||||
bb.fatal('OVERRIDES not defined')
|
||||
|
||||
@@ -107,8 +107,8 @@ python build_efi_cfg() {
|
||||
entrycfg.write('title %s\n' % label)
|
||||
entrycfg.write('linux /vmlinuz\n')
|
||||
|
||||
append = localdata.getVar('APPEND', True)
|
||||
initrd = localdata.getVar('INITRD', True)
|
||||
append = localdata.getVar('APPEND')
|
||||
initrd = localdata.getVar('INITRD')
|
||||
|
||||
if initrd:
|
||||
entrycfg.write('initrd /initrd\n')
|
||||
|
||||
Reference in New Issue
Block a user