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 /meta/classes/insane.bbclass | |
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 'meta/classes/insane.bbclass')
-rw-r--r-- | meta/classes/insane.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index f8f6e002f7..632821cbbe 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass | |||
@@ -336,7 +336,7 @@ def package_qa_check_libdir(d): | |||
336 | import re | 336 | import re |
337 | 337 | ||
338 | pkgdest = d.getVar('PKGDEST') | 338 | pkgdest = d.getVar('PKGDEST') |
339 | base_libdir = d.getVar("base_libdir",True) + os.sep | 339 | base_libdir = d.getVar("base_libdir") + os.sep |
340 | libdir = d.getVar("libdir") + os.sep | 340 | libdir = d.getVar("libdir") + os.sep |
341 | libexecdir = d.getVar("libexecdir") + os.sep | 341 | libexecdir = d.getVar("libexecdir") + os.sep |
342 | exec_prefix = d.getVar("exec_prefix") + os.sep | 342 | exec_prefix = d.getVar("exec_prefix") + os.sep |
@@ -568,7 +568,7 @@ def package_qa_check_desktop(path, name, d, elf, messages): | |||
568 | Run all desktop files through desktop-file-validate. | 568 | Run all desktop files through desktop-file-validate. |
569 | """ | 569 | """ |
570 | if path.endswith(".desktop"): | 570 | if path.endswith(".desktop"): |
571 | desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE',True),'desktop-file-validate') | 571 | desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),'desktop-file-validate') |
572 | output = os.popen("%s %s" % (desktop_file_validate, path)) | 572 | output = os.popen("%s %s" % (desktop_file_validate, path)) |
573 | # This only produces output on errors | 573 | # This only produces output on errors |
574 | for l in output: | 574 | for l in output: |