summaryrefslogtreecommitdiffstats
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-09 13:39:11 +0000
commit022a8b58c862a1db68c2dcddc908317e5d61d92e (patch)
tree55fbd06754d21b0cad93128e0c912acc2638a959 /meta/classes/license.bbclass
parente016eb10b075e280b4e78a04e47b59a173386421 (diff)
downloadpoky-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/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):
117 copy_lic_manifest = d.getVar('COPY_LIC_MANIFEST') 117 copy_lic_manifest = d.getVar('COPY_LIC_MANIFEST')
118 copy_lic_dirs = d.getVar('COPY_LIC_DIRS') 118 copy_lic_dirs = d.getVar('COPY_LIC_DIRS')
119 if copy_lic_manifest == "1": 119 if copy_lic_manifest == "1":
120 rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS', 'True'), 120 rootfs_license_dir = os.path.join(d.getVar('IMAGE_ROOTFS'),
121 'usr', 'share', 'common-licenses') 121 'usr', 'share', 'common-licenses')
122 bb.utils.mkdirhier(rootfs_license_dir) 122 bb.utils.mkdirhier(rootfs_license_dir)
123 rootfs_license_manifest = os.path.join(rootfs_license_dir, 123 rootfs_license_manifest = os.path.join(rootfs_license_dir,
@@ -516,7 +516,7 @@ def canonical_license(d, license):
516 """ 516 """
517 lic = d.getVarFlag('SPDXLICENSEMAP', license) or "" 517 lic = d.getVarFlag('SPDXLICENSEMAP', license) or ""
518 if not lic and license.endswith('+'): 518 if not lic and license.endswith('+'):
519 lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'), True) 519 lic = d.getVarFlag('SPDXLICENSEMAP', license.rstrip('+'))
520 if lic: 520 if lic:
521 lic += '+' 521 lic += '+'
522 return lic or license 522 return lic or license