[OE-core] [PATCH][fido] classes/license.bbclass: Improve generic license copy validation.

[Flanagan, Elizabeth]

On 24 June 2015 at 17:49, Aníbal Limón <anibal.limon at linux.intel.com> wrote:
> Remove + char in any position for cover cases when license has
> the form like GPL-2.0+-with-OpenSSL-exception.
>
> [YOCTO #7584]
>
> Signed-off-by: Aníbal Limón <anibal.limon at linux.intel.com>
> ---
>  meta/classes/license.bbclass | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
> index 73a0e97..e00a695 100644
> --- a/meta/classes/license.bbclass
> +++ b/meta/classes/license.bbclass
> @@ -71,8 +71,12 @@ license_create_manifest() {
>
>                 lics="$(echo ${pkged_lic} | sed "s/[|&()*]/ /g" | sed "s/  */ /g" )"
>                 for lic in ${lics}; do
> +                       # remove + chars in any position this cover cases like
> +                       # GPL-2.0+-with-OpenSSL-exception -> GPL-2.0-with-OpenSSL-exception
> +                       lic="$(echo ${lic} | sed "s/\+//g")"
> +
>                         # to reference a license file trim trailing + symbol
> -                       if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic%+}" ]; then
> +                       if ! [ -e "${LICENSE_DIRECTORY}/${pkged_pn}/generic_${lic}" ]; then
>                                 bbwarn "The license listed ${lic} was not in the licenses collected for ${pkged_pn}"
>                         fi
>                 done
> --
> 1.9.1
>
> --

This looks like the right fix for this for right now.

Acked-by: Beth Flanagan <elizabeth.flanagan at intel.com>

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core



-- 
Elizabeth Flanagan
Yocto Project
Build and Release