license_class: Add explicity avoid of CLOSED license in validations
PATCH 1/1 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 <[email protected]>
--- meta/classes/license.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
meta/classes/license.bbclass +9 -2
@@ -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:
Signature · 1 line
1.8.4.5
Sorry i forget to put [FIDO] suffix.
Regards,
alimon
Quoted 39 lines · Aníbal Limón
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 <[email protected]>--- meta/classes/license.bbclass | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)meta/classes/license.bbclass +9
-2@@ -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: