* [PATCH][fido] classes/license.bbclass: Improve generic license copy validation.
@ 2015-06-24 16:49 Aníbal Limón
2015-06-24 18:59 ` Flanagan, Elizabeth
2015-06-26 14:30 ` Joshua Lock
0 siblings, 2 replies; 3+ messages in thread
From: Aníbal Limón @ 2015-06-24 16:49 UTC (permalink / raw)
To: openembedded-core
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@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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH][fido] classes/license.bbclass: Improve generic license copy validation.
2015-06-24 16:49 [PATCH][fido] classes/license.bbclass: Improve generic license copy validation Aníbal Limón
@ 2015-06-24 18:59 ` Flanagan, Elizabeth
2015-06-26 14:30 ` Joshua Lock
1 sibling, 0 replies; 3+ messages in thread
From: Flanagan, Elizabeth @ 2015-06-24 18:59 UTC (permalink / raw)
To: Aníbal Limón; +Cc: Patches and discussions about the oe-core layer
On 24 June 2015 at 17:49, Aníbal Limón <anibal.limon@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@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@intel.com>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Elizabeth Flanagan
Yocto Project
Build and Release
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][fido] classes/license.bbclass: Improve generic license copy validation.
2015-06-24 16:49 [PATCH][fido] classes/license.bbclass: Improve generic license copy validation Aníbal Limón
2015-06-24 18:59 ` Flanagan, Elizabeth
@ 2015-06-26 14:30 ` Joshua Lock
1 sibling, 0 replies; 3+ messages in thread
From: Joshua Lock @ 2015-06-26 14:30 UTC (permalink / raw)
To: openembedded-core
On Wed, 2015-06-24 at 11:49 -0500, Aníbal Limón wrote:
> Remove + char in any position for cover cases when license has
> the form like GPL-2.0+-with-OpenSSL-exception.
>
> [YOCTO #7584]
Thanks Aníbal,
This is queued in my fido-next branch[1].
Regards,
Joshua
1. http://cgit.openembedded.org/openembedded-core
-contrib/log/?h=joshuagl/fido-next
>
> Signed-off-by: Aníbal Limón <anibal.limon@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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-26 14:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-24 16:49 [PATCH][fido] classes/license.bbclass: Improve generic license copy validation Aníbal Limón
2015-06-24 18:59 ` Flanagan, Elizabeth
2015-06-26 14:30 ` Joshua Lock
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.