From 0ab56ad52937823dc66b541dd4eda09fb6a34407 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Tue, 29 Jan 2013 22:17:20 +0100 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index d4ebb26d2b..170bdd9476 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) -- cgit v1.2.3