| Submitter | Elizabeth Flanagan |
|---|---|
| Date | Sept. 26, 2012, 9:50 p.m. |
| Message ID | <c2df57712e4e2ce9e87121b063835f51e5a76d7c.1348695851.git.elizabeth.flanagan@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/37309/ |
| State | Accepted |
| Commit | c6e13d9cd26d016ab06e7447b307d413e1331aa0 |
| Headers | show |
Comments
On 09/26/2012 02:50 PM, Elizabeth Flanagan wrote: > The variable mentioned in license.conf is LICENSE_PATH. The variable > used in license.bbclass is LICENSE_DIR. Conforming to what is in > license.conf > > Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> > --- > meta/classes/license.bbclass | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass > index ffcaf93..ad543f6 100644 > --- a/meta/classes/license.bbclass > +++ b/meta/classes/license.bbclass > @@ -186,7 +186,7 @@ python do_populate_lic() { > license_source_dirs = [] > license_source_dirs.append(generic_directory) > try: > - additional_lic_dirs = d.getVar('LICENSE_DIR', True).split() > + additional_lic_dirs = d.getVar('LICENSE_PATH', True).split() Beth, I found that we also have LICENSE_DIRECTORY, so the intent here is to be a multiple directory (such as a search PATH) for licenses? There is also some documentation that needs to be changed, should not prevent this patch from being pulled. Sau! > for lic_dir in additional_lic_dirs: > license_source_dirs.append(lic_dir) > except: >
Patch
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index ffcaf93..ad543f6 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -186,7 +186,7 @@ python do_populate_lic() { license_source_dirs = [] license_source_dirs.append(generic_directory) try: - additional_lic_dirs = d.getVar('LICENSE_DIR', True).split() + additional_lic_dirs = d.getVar('LICENSE_PATH', True).split() for lic_dir in additional_lic_dirs: license_source_dirs.append(lic_dir) except:
The variable mentioned in license.conf is LICENSE_PATH. The variable used in license.bbclass is LICENSE_DIR. Conforming to what is in license.conf Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/license.bbclass | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)