From 688f7a64917a5ce5cbe12f8e5da4d47e265d240f 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). Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes/insane.bbclass') 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): import re pkgdest = d.getVar('PKGDEST') - base_libdir = d.getVar("base_libdir",True) + os.sep + base_libdir = d.getVar("base_libdir") + os.sep libdir = d.getVar("libdir") + os.sep libexecdir = d.getVar("libexecdir") + os.sep exec_prefix = d.getVar("exec_prefix") + os.sep @@ -568,7 +568,7 @@ def package_qa_check_desktop(path, name, d, elf, messages): Run all desktop files through desktop-file-validate. """ if path.endswith(".desktop"): - desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE',True),'desktop-file-validate') + desktop_file_validate = os.path.join(d.getVar('STAGING_BINDIR_NATIVE'),'desktop-file-validate') output = os.popen("%s %s" % (desktop_file_validate, path)) # This only produces output on errors for l in output: -- cgit v1.2.3