[oe-commits] Martin Jansa : license: fix LICENSE_CREATE_PACKAGE to stay disabled by default

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: bc42585ad9ca3a9891459ec3234893dff420b95b
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bc42585ad9ca3a9891459ec3234893dff420b95b

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Tue Jan 29 22:17:20 2013 +0100

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)

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 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 d4ebb26..170bdd9 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)