summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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() {
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: