summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-05-18 20:33:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-22 13:29:47 +0100
commit45bf783a23932d25a542e0f914297eec74ffc2f0 (patch)
tree0120901b3d63618749f29c50eb068f8ceb87ed7a /meta
parentb3fba03eabe7afd0dd8a36067afc183c20610971 (diff)
downloadpoky-45bf783a23932d25a542e0f914297eec74ffc2f0.tar.gz
license_class: Add explicity avoid of CLOSED license in validations
The CLOSED license isn't a generic license it is a set and can be any closed source license. [YOCTO #7752] (From OE-Core rev: f33651a46d12bb763a4e3c13438d084411406849) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/license.bbclass10
1 files changed, 8 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 7972c79af5..756e7f04f3 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -80,6 +80,10 @@ python license_create_manifest() {
80 lic_file = os.path.join(d.getVar('LICENSE_DIRECTORY', True), 80 lic_file = os.path.join(d.getVar('LICENSE_DIRECTORY', True),
81 pkg_dic[pkg]["PN"], "generic_%s" % 81 pkg_dic[pkg]["PN"], "generic_%s" %
82 re.sub('\+', '', lic)) 82 re.sub('\+', '', lic))
83 # add explicity avoid of CLOSED license because isn't generic
84 if lic == "CLOSED":
85 continue
86
83 if not os.path.exists(lic_file): 87 if not os.path.exists(lic_file):
84 bb.warn("The license listed %s was not in the "\ 88 bb.warn("The license listed %s was not in the "\
85 "licenses collected for recipe %s" 89 "licenses collected for recipe %s"
@@ -278,8 +282,10 @@ def find_license_files(d):
278 lic_files_paths.append(("generic_" + license_type, path)) 282 lic_files_paths.append(("generic_" + license_type, path))
279 break 283 break
280 else: 284 else:
281 # And here is where we warn people that their licenses are lousy 285 # Add explicity avoid of CLOSED license because this isn't generic
282 bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type)) 286 if license_type != 'CLOSED':
287 # And here is where we warn people that their licenses are lousy
288 bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type))
283 pass 289 pass
284 290
285 if not generic_directory: 291 if not generic_directory: