summaryrefslogtreecommitdiff
path: root/meta/classes/license.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-06 11:46:14 +0000
commit688f7a64917a5ce5cbe12f8e5da4d47e265d240f (patch)
treedec209d96fc00cc8a5fdd9ffd3f47abc167e0f4b /meta/classes/license.bbclass
parentaf330fc0087692039d4256a6fb1e122742e8ec1a (diff)
downloadopenembedded-core-688f7a64917a5ce5cbe12f8e5da4d47e265d240f.tar.gz
openembedded-core-688f7a64917a5ce5cbe12f8e5da4d47e265d240f.tar.bz2
openembedded-core-688f7a64917a5ce5cbe12f8e5da4d47e265d240f.zip
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 <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r--meta/classes/license.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 009ee4a37d..44467d09bf 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -117,7 +117,7 @@ def write_license_files(d, license_manifest, pkg_dic):
copy_lic_manifest = d.getVar('COPY_LIC_MANIFEST')
copy_lic_dirs = d.getVar('COPY_LIC_DIRS')
if copy_lic_manifest == "1":
- rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS', 'True'),
+ rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS'),
'usr', 'share', 'common-licenses')
bb.utils.mkdirhier(rootfs_license_dir)
rootfs_license_manifest = os.path.join(rootfs_license_dir,
@@ -516,7 +516,7 @@ def canonical_license(d, license):
"""
lic = d.getVarFlag('SPDXLICENSEMAP', license) or ""
if not lic and license.endswith('+'):
- lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'), True)
+ lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'))
if lic:
lic += '+'
return lic or license