From 022a8b58c862a1db68c2dcddc908317e5d61d92e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 5 Jan 2017 21:15:08 +0000 Subject: meta/scripts: Various getVar/getVarFlag expansion parameter fixes There were a few straggling expansion parameter removals left for getVar/getVarFlag where the odd whitespace meant they were missed on previous passes. There were also some plain broken ussages such as: d.getVar('ALTERNATIVE_TARGET', old_name, True) path = d.getVar('PATH', d, True) d.getVar('IMAGE_ROOTFS', 'True') which I've corrected (they happend to work by luck). (From OE-Core rev: 688f7a64917a5ce5cbe12f8e5da4d47e265d240f) Signed-off-by: Richard Purdie --- meta/classes/gummiboot.bbclass | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'meta/classes/gummiboot.bbclass') diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass index 4f2dea6c3d..5aaf766ef4 100644 --- a/meta/classes/gummiboot.bbclass +++ b/meta/classes/gummiboot.bbclass @@ -60,8 +60,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 @@ -70,7 +70,7 @@ python build_efi_cfg() { bb.debug(1, "No labels, nothing to do") return - cfile = d.getVar('GUMMIBOOT_CFG', True) + cfile = d.getVar('GUMMIBOOT_CFG') try: cfgfile = open(cfile, 'w') except OSError: @@ -78,7 +78,7 @@ python build_efi_cfg() { cfgfile.write('# Automatically created by OE\n') cfgfile.write('default %s\n' % (labels.split()[0])) - timeout = d.getVar('GUMMIBOOT_TIMEOUT', True) + timeout = d.getVar('GUMMIBOOT_TIMEOUT') if timeout: cfgfile.write('timeout %s\n' % timeout) else: @@ -88,7 +88,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') @@ -104,8 +104,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') -- cgit v1.2.3-54-g00ecf