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>

diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 4e3cd1cbdf0e1d08cdce7e27bed831b77bb1bd0c..9c4ccb31e36c5de7cfa21e8612a85acc169484dc 100644 (file)
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -66,9 +66,10 @@ python do_populate_lic() {
     # I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is. 
     # So what I do is just link to every license mentioned in the license field.
     
-    for license_type in (' '.join(license_types.replace('&', ' ').replace('+', ' ').replace('|', ' ')
-                         .replace('(', ' ').replace(')', ' ').replace(';', ' ').replace(',', ' ').split())):
-        if os.path.isfile(os.path.join(generic_directory, license_type)):
+    for license_type in ((license_types.replace('+', '').replace('|', '&')
+                          .replace('(', '').replace(')', '').replace(';', '')
+                          .replace(',', '').replace(" ", "").split("&"))):
+if os.path.isfile(os.path.join(generic_directory, license_type)):
             gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses")
             try:
                 bb.mkdirhier(gen_lic_dest)

diff --git a/meta/files/common-licenses/MIT b/meta/files/common-licenses/MIT
new file mode 100644 (file)
index 0000000..d136d5e
--- /dev/null
+++ b/meta/files/common-licenses/MIT
@@ -0,0 +1,6 @@
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

diff --git a/meta/files/common-licenses/MIT-style b/meta/files/common-licenses/MIT-style
new file mode 120000 (symlink)
index 0000000..8ab70c0
--- /dev/null
+++ b/meta/files/common-licenses/MIT-style
@@ -0,0 +1 @@
+MIT
\ No newline at end of file