diff options
author | Joshua Lock <josh@linux.intel.com> | 2011-01-31 11:11:30 +0000 |
---|---|---|
committer | Joshua Lock <josh@linux.intel.com> | 2011-01-31 11:11:30 +0000 |
commit | 92f1b4976b4352d0dbd43392b59628c85873b063 (patch) | |
tree | 2665bacefec292318ff62fdfec54c653de7f0122 | |
parent | 612d59f7d12dc37a8c97c115a068e07089d5be5c (diff) | |
download | poky-92f1b4976b4352d0dbd43392b59628c85873b063.tar.gz |
license.bbclass: handle | (or) in the LICENSE field
The class strips out operators from the LICENSE field and to reduce it to a
list of license, | was missing but is quite frequently used so add it to the
list of replaced characters.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r-- | meta/classes/license.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index ddedd577cc..22c40c1596 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -76,7 +76,7 @@ python do_populate_lic() { | |||
76 | # I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is. | 76 | # I'm sure someone has written a logic parser for these fields, but if so, I don't know where it is. |
77 | # So what I do is just link to every license mentioned in the license field. | 77 | # So what I do is just link to every license mentioned in the license field. |
78 | 78 | ||
79 | for license_type in license_types.replace('&', '').replace('+', '').replace('&', '').replace('(', '').replace(')', '').split(): | 79 | for license_type in license_types.replace('&', '').replace('+', '').replace('&', '').replace('|', '').replace('(', '').replace(')', '').split(): |
80 | if os.path.isfile(os.path.join(generic_directory, license_type)): | 80 | if os.path.isfile(os.path.join(generic_directory, license_type)): |
81 | gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses") | 81 | gen_lic_dest = os.path.join(bb.data.getVar('LICENSE_DIRECTORY', d, True), "common-licenses") |
82 | try: | 82 | try: |