mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 00:20:08 +00:00
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>
This commit is contained in:
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user