Patchwork [PATCHv3] license: fix LICENSE_CREATE_PACKAGE to stay disabled by default

login
register
mail settings
Submitter Martin Jansa
Date Jan. 29, 2013, 9:17 p.m.
Message ID <1359494240-11040-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/43661/
State Accepted
Commit 0ab56ad52937823dc66b541dd4eda09fb6a34407
Headers show

Comments

Martin Jansa - Jan. 29, 2013, 9:17 p.m.
* 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@gmail.com>
---
 meta/classes/license.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Patch

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)