From f33651a46d12bb763a4e3c13438d084411406849 Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Mon, 18 May 2015 20:33:07 +0000 Subject: license_class: Add explicity avoid of CLOSED license in validations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The CLOSED license isn't a generic license it is a set and can be any closed source license. [YOCTO #7752] Signed-off-by: Aníbal Limón Signed-off-by: Ross Burton --- meta/classes/license.bbclass | 10 ++++++++-- 1 file 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() { lic_file = os.path.join(d.getVar('LICENSE_DIRECTORY', True), pkg_dic[pkg]["PN"], "generic_%s" % re.sub('\+', '', lic)) + # add explicity avoid of CLOSED license because isn't generic + if lic == "CLOSED": + continue + if not os.path.exists(lic_file): bb.warn("The license listed %s was not in the "\ "licenses collected for recipe %s" @@ -278,8 +282,10 @@ def find_license_files(d): lic_files_paths.append(("generic_" + license_type, path)) break else: - # And here is where we warn people that their licenses are lousy - bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type)) + # Add explicity avoid of CLOSED license because this isn't generic + if license_type != 'CLOSED': + # And here is where we warn people that their licenses are lousy + bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type)) pass if not generic_directory: -- cgit 1.2.3-korg