From 5272e883ffe9f4b67ec0929730c43e6ad439d2a4 Mon Sep 17 00:00:00 2001 From: Elizabeth Flanagan Date: Fri, 24 Feb 2012 14:17:38 -0800 Subject: license.bbclass: Gather Pkg level licenses We should look for LICENSE at a package level first. If it's not found, we should use the recipe level LICENSE. This adds a bit more granularity to license manifests where needed. (From OE-Core rev: d50dd280f52587b6225bc5db3c9e85f78107f5f5) Signed-off-by: Elizabeth Flanagan Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 10a937b10c..11908d90da 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -140,8 +140,20 @@ python do_populate_lic() { import shutil import oe.license - # All the license types for the package - license_types = d.getVar('LICENSE', True) + pn = d.getVar('PN', True) + for package in d.getVar('PACKAGES', True): + if d.getVar('LICENSE_' + pn + '-' + package, True): + license_types = license_types + ' & ' + \ + d.getVar('LICENSE_' + pn + '-' + 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. + try: + license_types + except NameError: + # All the license types at the recipe level + license_types = d.getVar('LICENSE', True) + # All the license files for the package lic_files = d.getVar('LIC_FILES_CHKSUM', True) pn = d.getVar('PN', True) -- cgit v1.2.3-54-g00ecf