diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2015-05-18 19:17:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:16 +0100 |
commit | 4dd8c7e80538347301a75aeede3899e1bf32311a (patch) | |
tree | 0996892a64bbb6f4e39d0e769e0bfea60da403ac /meta/classes | |
parent | a8d4f5cd2bd8df60cee3610bb658d15b7e1ded11 (diff) | |
download | poky-4dd8c7e80538347301a75aeede3899e1bf32311a.tar.gz |
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]
(From OE-Core rev: 56c673af4363a9c690eabff8b1fdaa202efb95ce)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/license.bbclass | 11 |
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() { | |||
71 | 71 | ||
72 | lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/ */ /g" )" | 72 | lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/ */ /g" )" |
73 | for lic in ${lics}; do | 73 | for lic in ${lics}; do |
74 | # add explicity avoid of CLOSED license because isn't generic | ||
75 | if [ "$lic" = "CLOSED" ]; then | ||
76 | continue | ||
77 | fi | ||
78 | |||
74 | # to reference a license file trim trailing + symbol | 79 | # to reference a license file trim trailing + symbol |
75 | if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then | 80 | if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then |
76 | bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" | 81 | bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}" |
@@ -242,8 +247,10 @@ def find_license_files(d): | |||
242 | 247 | ||
243 | lic_files_paths.append(("generic_" + license_type, os.path.join(license_source, spdx_generic))) | 248 | lic_files_paths.append(("generic_" + license_type, os.path.join(license_source, spdx_generic))) |
244 | else: | 249 | else: |
245 | # And here is where we warn people that their licenses are lousy | 250 | # Add explicity avoid of CLOSED license because this isn't generic |
246 | bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type)) | 251 | if license_type != 'CLOSED': |
252 | # And here is where we warn people that their licenses are lousy | ||
253 | bb.warn("%s: No generic license file exists for: %s in any provider" % (pn, license_type)) | ||
247 | pass | 254 | pass |
248 | 255 | ||
249 | if not generic_directory: | 256 | if not generic_directory: |