diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/classes/license.bbclass | |
parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/license.bbclass')
-rw-r--r-- | meta/classes/license.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c87473cbb8..fecbc49497 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -6,7 +6,7 @@ | |||
6 | LICENSE_DIRECTORY ??= "${DEPLOY_DIR}/licenses" | 6 | 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[type] = "boolean" |
11 | LICENSE_CREATE_PACKAGE ??= "0" | 11 | LICENSE_CREATE_PACKAGE ??= "0" |
12 | LICENSE_PACKAGE_SUFFIX ??= "-lic" | 12 | LICENSE_PACKAGE_SUFFIX ??= "-lic" |
@@ -32,8 +32,8 @@ python do_populate_lic() { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '')).split())}" | 34 | PSEUDO_IGNORE_PATHS .= ",${@','.join(((d.getVar('COMMON_LICENSE_DIR') or '') + ' ' + (d.getVar('LICENSE_PATH') or '')).split())}" |
35 | # it would be better to copy them in do_install_append, but find_license_filesa is python | 35 | # it would be better to copy them in do_install:append, but find_license_filesa is python |
36 | python perform_packagecopy_prepend () { | 36 | python perform_packagecopy:prepend () { |
37 | enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) | 37 | enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) |
38 | if d.getVar('CLASSOVERRIDE') == 'class-target' and enabled: | 38 | if d.getVar('CLASSOVERRIDE') == 'class-target' and enabled: |
39 | lic_files_paths = find_license_files(d) | 39 | lic_files_paths = find_license_files(d) |
@@ -62,7 +62,7 @@ def add_package_and_files(d): | |||
62 | else: | 62 | else: |
63 | # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY | 63 | # first in PACKAGES to be sure that nothing else gets LICENSE_FILES_DIRECTORY |
64 | d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) | 64 | d.setVar('PACKAGES', "%s %s" % (pn_lic, packages)) |
65 | d.setVar('FILES_' + pn_lic, files) | 65 | d.setVar('FILES:' + pn_lic, files) |
66 | 66 | ||
67 | def copy_license_files(lic_files_paths, destdir): | 67 | def copy_license_files(lic_files_paths, destdir): |
68 | import shutil | 68 | import shutil |
@@ -324,7 +324,7 @@ def incompatible_license(d, dont_want_licenses, package=None): | |||
324 | as canonical (SPDX) names. | 324 | as canonical (SPDX) names. |
325 | """ | 325 | """ |
326 | import oe.license | 326 | import oe.license |
327 | license = d.getVar("LICENSE_%s" % package) if package else None | 327 | license = d.getVar("LICENSE:%s" % package) if package else None |
328 | if not license: | 328 | if not license: |
329 | license = d.getVar('LICENSE') | 329 | license = d.getVar('LICENSE') |
330 | 330 | ||
@@ -419,7 +419,7 @@ SSTATETASKS += "do_populate_lic" | |||
419 | do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" | 419 | do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" |
420 | do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" | 420 | do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" |
421 | 421 | ||
422 | IMAGE_CLASSES_append = " license_image" | 422 | IMAGE_CLASSES:append = " license_image" |
423 | 423 | ||
424 | python do_populate_lic_setscene () { | 424 | python do_populate_lic_setscene () { |
425 | sstate_setscene(d) | 425 | sstate_setscene(d) |