| Submitter | Elizabeth Flanagan |
|---|---|
| Date | Nov. 20, 2012, 9:49 p.m. |
| Message ID | <CAPhnLPAx0bgPRk-YT3uWLfETOhE9ECu0Akxv5i8UGDU+L3-hKg@mail.gmail.com> |
| Download | mbox | patch |
| Permalink | /patch/39373/ |
| State | New |
| Headers | show |
Comments
On Tue, Nov 20, 2012 at 7:49 PM, Flanagan, Elizabeth <elizabeth.flanagan@intel.com> wrote: > Some bad logic in license.bbclass misses certain package level > LICENSEs. > > Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> Does it also affects Danny?
On Wed, Nov 21, 2012 at 3:26 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Tue, Nov 20, 2012 at 7:49 PM, Flanagan, Elizabeth > <elizabeth.flanagan@intel.com> wrote: >> Some bad logic in license.bbclass misses certain package level >> LICENSEs. >> >> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> > > Does it also affects Danny? > Yes, this patch should also be pulled into danny. > -- > Otavio Salvador O.S. Systems > E-mail: otavio@ossystems.com.br http://www.ossystems.com.br > Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
Patch
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 7e1c23f..c7ca4a6 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -97,9 +97,9 @@ python do_populate_lic() { pn = d.getVar('PN', True) for package in d.getVar('PACKAGES', True): - if d.getVar('LICENSE_' + pn + '-' + package, True): + if d.getVar('LICENSE_' + package, True): license_types = license_types + ' & ' + \ - d.getVar('LICENSE_' + pn + '-' + package, True) + d.getVar('LICENSE_' + package, True) #If we get here with no license types, then that means we have a recipe #level license. If so, we grab only those.
Some bad logic in license.bbclass misses certain package level LICENSEs. Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/license.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)