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:54:30 +0000 |
commit | da57e6bff82e24d3c27ebd4e4d32a622cb258e42 (patch) | |
tree | e8afdec8f07eba2c3972c515c718ee35fc465924 /meta | |
parent | c0f419528fb044714ada559c789626193e91574f (diff) | |
download | poky-da57e6bff82e24d3c27ebd4e4d32a622cb258e42.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)
(From OE-Core rev: 0ab56ad52937823dc66b541dd4eda09fb6a34407)
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')
-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 d4ebb26d2b..170bdd9476 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -7,6 +7,7 @@ LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses" | |||
7 | LICSSTATEDIR = "${WORKDIR}/license-destdir/" | 7 | LICSSTATEDIR = "${WORKDIR}/license-destdir/" |
8 | 8 | ||
9 | # Create extra package with license texts and add it to RRECOMMENDS_${PN} | 9 | # Create extra package with license texts and add it to RRECOMMENDS_${PN} |
10 | LICENSE_CREATE_PACKAGE[type] = "boolean" | ||
10 | LICENSE_CREATE_PACKAGE ??= "0" | 11 | LICENSE_CREATE_PACKAGE ??= "0" |
11 | LICENSE_PACKAGE_SUFFIX ??= "-lic" | 12 | LICENSE_PACKAGE_SUFFIX ??= "-lic" |
12 | LICENSE_FILES_DIRECTORY ??= "${datadir}/licenses/" | 13 | LICENSE_FILES_DIRECTORY ??= "${datadir}/licenses/" |
@@ -102,7 +103,7 @@ python do_populate_lic() { | |||
102 | 103 | ||
103 | # it would be better to copy them in do_install_append, but find_license_filesa is python | 104 | # it would be better to copy them in do_install_append, but find_license_filesa is python |
104 | python perform_packagecopy_prepend () { | 105 | python perform_packagecopy_prepend () { |
105 | enabled = d.getVar('LICENSE_CREATE_PACKAGE', True) | 106 | enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) |
106 | if d.getVar('CLASSOVERRIDE', True) == 'class-target' and enabled: | 107 | if d.getVar('CLASSOVERRIDE', True) == 'class-target' and enabled: |
107 | lic_files_paths = find_license_files(d) | 108 | lic_files_paths = find_license_files(d) |
108 | 109 | ||