[oe-commits] =?UTF-8?Q?An=C3=ADbal=20Lim=C3=B3n=20?=: license_class: Add explicity avoid of CLOSED license in validations

git at git.openembedded.org git at git.openembedded.org
Sun Jun 28 08:46:40 UTC 2015


Module: openembedded-core.git
Branch: fido
Commit: 56c673af4363a9c690eabff8b1fdaa202efb95ce
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=56c673af4363a9c690eabff8b1fdaa202efb95ce

Author: Aníbal Limón <anibal.limon at linux.intel.com>
Date:   Mon May 18 19:17:32 2015 +0000

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]

Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>

---

 meta/classes/license.bbclass | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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:



More information about the Openembedded-commits mailing list