summaryrefslogtreecommitdiffstats
path: root/meta/classes/license.bbclass
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-02-26 14:04:41 -0800
committerBeth Flanagan <elizabeth.flanagan@intel.com>2011-02-26 14:04:41 -0800
commitd041ab31a106e914d511a98b682e9df41ffc51e2 (patch)
tree9ddc577d94011016f8927292695c7a028a30b017 /meta/classes/license.bbclass
parent00dee01d4ba1aa58fb7d548ad808684d3afb4a5b (diff)
downloadpoky-d041ab31a106e914d511a98b682e9df41ffc51e2.tar.gz
Fixing my bad license parsing: license.bbclass
Fix to my bad license parsing. Also added the MIT generic license files. Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r--meta/classes/license.bbclass7
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4e3cd1cbdf..9c4ccb31e3 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -66,9 +66,10 @@ python do_populate_lic() {
66 # I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is. 66 # I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is.
67 # So what I do is just link to every license mentioned in the license field. 67 # So what I do is just link to every license mentioned in the license field.
68 68
69 for license_type in (' '.join(license_types.replace('&', ' ').replace('+', ' ').replace('|', ' ') 69 for license_type in ((license_types.replace('+', '').replace('|', '&')
70 .replace('(', ' ').replace(')', ' ').replace(';', ' ').replace(',', ' ').split())): 70 .replace('(', '').replace(')', '').replace(';', '')
71 if os.path.isfile(os.path.join(generic_directory, license_type)): 71 .replace(',', '').replace(" ", "").split("&"))):
72if os.path.isfile(os.path.join(generic_directory, license_type)):
72 gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses") 73 gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses")
73 try: 74 try:
74 bb.mkdirhier(gen_lic_dest) 75 bb.mkdirhier(gen_lic_dest)