]> code.ossystems Code Review - openembedded-core.git/commitdiff
license_class: Add explicity avoid of CLOSED license in validations
authorAníbal Limón <anibal.limon@linux.intel.com>
Mon, 18 May 2015 19:17:32 +0000 (19:17 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 28 Jun 2015 08:42:01 +0000 (09:42 +0100)
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@linux.intel.com>
meta/classes/license.bbclass

index 73a0e9727e75d188c0fec73fa9c5bfb27e9be0d2..fdc117010e9b2932f5c809ccb9fc4f342761176d 100644 (file)
@@ -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: