summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-05-18 19:17:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-28 09:42:01 +0100
commit56c673af4363a9c690eabff8b1fdaa202efb95ce (patch)
treeb9301e1b4ba250349a85c6e842bc482a10ae7ed9
parent0dc77f11553b5d50cb186f2cc00df28ecea07bb6 (diff)
downloadopenembedded-core-56c673af4363a9c690eabff8b1fdaa202efb95ce.tar.gz
openembedded-core-56c673af4363a9c690eabff8b1fdaa202efb95ce.tar.bz2
openembedded-core-56c673af4363a9c690eabff8b1fdaa202efb95ce.zip
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@linux.intel.com>
-rw-r--r--meta/classes/license.bbclass11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 73a0e9727e..fdc117010e 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: