summaryrefslogtreecommitdiffstats
path: root/meta/classes/package.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-05 21:15:08 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:11 +0000
commit022a8b58c862a1db68c2dcddc908317e5d61d92e (patch)
tree55fbd06754d21b0cad93128e0c912acc2638a959 /meta/classes/package.bbclass
parente016eb10b075e280b4e78a04e47b59a173386421 (diff)
downloadpoky-022a8b58c862a1db68c2dcddc908317e5d61d92e.tar.gz
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package.bbclass')
-rw-r--r--meta/classes/package.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index e177e775e5..568b85c12a 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1286,11 +1286,11 @@ python emit_pkgdata() {
1286 c = codecs.getencoder("unicode_escape") 1286 c = codecs.getencoder("unicode_escape")
1287 return c(str)[0].decode("latin1") 1287 return c(str)[0].decode("latin1")
1288 1288
1289 val = d.getVar('%s_%s' % (var, pkg), True) 1289 val = d.getVar('%s_%s' % (var, pkg))
1290 if val: 1290 if val:
1291 f.write('%s_%s: %s\n' % (var, pkg, encode(val))) 1291 f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
1292 return val 1292 return val
1293 val = d.getVar('%s' % (var), True) 1293 val = d.getVar('%s' % (var))
1294 if val: 1294 if val:
1295 f.write('%s: %s\n' % (var, encode(val))) 1295 f.write('%s: %s\n' % (var, encode(val)))
1296 return val 1296 return val