From 4dd8c7e80538347301a75aeede3899e1bf32311a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= Date: Mon, 18 May 2015 19:17:32 +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] (From OE-Core rev: 56c673af4363a9c690eabff8b1fdaa202efb95ce) Signed-off-by: Aníbal Limón Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 73a0e97..fdc1170 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -71,6 +71,11 @@ license_create_manifest() { lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/ */ /g" )" for lic in ${lics}; do + # add explicity avoid of CLOSED license because isn't generic + if [ "$lic" = "CLOSED" ]; then + continue + fi + # to reference a license file trim trailing + symbol if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" @@ -242,8 +247,10 @@ def find_license_files(d): lic_files_paths.append(("generic_" + license_type, os.path.join(license_source, spdx_generic))) 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 v1.1