diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 21:15:08 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-09 13:39:11 +0000 |
commit | 022a8b58c862a1db68c2dcddc908317e5d61d92e (patch) | |
tree | 55fbd06754d21b0cad93128e0c912acc2638a959 /scripts | |
parent | e016eb10b075e280b4e78a04e47b59a173386421 (diff) | |
download | poky-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 'scripts')
-rw-r--r-- | scripts/lib/devtool/package.py | 2 | ||||
-rw-r--r-- | scripts/lib/devtool/upgrade.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/package.py b/scripts/lib/devtool/package.py index b4f4720fd3..af9e8f15f5 100644 --- a/scripts/lib/devtool/package.py +++ b/scripts/lib/devtool/package.py | |||
@@ -34,7 +34,7 @@ def package(args, config, basepath, workspace): | |||
34 | if not image_pkgtype: | 34 | if not image_pkgtype: |
35 | image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE') | 35 | image_pkgtype = tinfoil.config_data.getVar('IMAGE_PKGTYPE') |
36 | 36 | ||
37 | deploy_dir_pkg = tinfoil.config_data.getVar('DEPLOY_DIR_%s' % image_pkgtype.upper(), True) | 37 | deploy_dir_pkg = tinfoil.config_data.getVar('DEPLOY_DIR_%s' % image_pkgtype.upper()) |
38 | finally: | 38 | finally: |
39 | tinfoil.shutdown() | 39 | tinfoil.shutdown() |
40 | 40 | ||
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 9595f3e7a4..c3343421c1 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py | |||
@@ -117,7 +117,7 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) | |||
117 | brf = os.path.basename(os.path.splitext(rc)[0]) # rc basename | 117 | brf = os.path.basename(os.path.splitext(rc)[0]) # rc basename |
118 | 118 | ||
119 | srctree = os.path.abspath(srctree) | 119 | srctree = os.path.abspath(srctree) |
120 | pn = d.getVar('PN',True) | 120 | pn = d.getVar('PN') |
121 | af = os.path.join(appendpath, '%s.bbappend' % brf) | 121 | af = os.path.join(appendpath, '%s.bbappend' % brf) |
122 | with open(af, 'w') as f: | 122 | with open(af, 'w') as f: |
123 | f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') | 123 | f.write('FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"\n\n') |