diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2013-01-29 22:17:20 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-01 15:51:31 +0000 |
| commit | 0ab56ad52937823dc66b541dd4eda09fb6a34407 (patch) | |
| tree | 42ec885afdbc8a8bb490c163ff4a37464f8ed3ad /meta/classes/license.bbclass | |
| parent | 92e74eb2f501b10a513e043d3d62007d8ab5f468 (diff) | |
| download | openembedded-core-contrib-0ab56ad52937823dc66b541dd4eda09fb6a34407.tar.gz | |
license: fix LICENSE_CREATE_PACKAGE to stay disabled by default
* as reported by Enrico on #oe
11:06:50 < ensc|w> JaMa: might this be caused by dc78ef91a2bf01efb8028c9afbe69e506e016265
which checks for 'd.getVar('LICENSE_CREATE_PACKAGE', True)' evaluating to 'True' for every
string (including the default 0)
(From OE-Core rev: bc42585ad9ca3a9891459ec3234893dff420b95b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
| -rw-r--r-- | meta/classes/license.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d4ebb26d2ba..170bdd9476b 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -7,6 +7,7 @@ LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses" LICSSTATEDIR = "${WORKDIR}/license-destdir/" # Create extra package with license texts and add it to RRECOMMENDS_${PN} +LICENSE_CREATE_PACKAGE[type] = "boolean" LICENSE_CREATE_PACKAGE ??= "0" LICENSE_PACKAGE_SUFFIX ??= "-lic" LICENSE_FILES_DIRECTORY ??= "${datadir}/licenses/" @@ -102,7 +103,7 @@ python do_populate_lic() { # it would be better to copy them in do_install_append, but find_license_filesa is python python perform_packagecopy_prepend () { - enabled = d.getVar('LICENSE_CREATE_PACKAGE', True) + enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) if d.getVar('CLASSOVERRIDE', True) == 'class-target' and enabled: lic_files_paths = find_license_files(d) |