diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-03 11:46:56 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-18 18:00:19 +0100 |
| commit | 6f4b2ce8a4d5ff374d5d839edb1d3c4afd426f37 (patch) | |
| tree | 356a003eba89874f52be6e73224fb0c8cc8ea1eb | |
| parent | 3de8ba0b1c592f0a50ada9ba6d9b2d1e23829731 (diff) | |
| download | poky-6f4b2ce8a4d5ff374d5d839edb1d3c4afd426f37.tar.gz | |
license: Exclude COPYING.MIT from pseudo
Along with the other license exclusions, we need to exclude the
top level COPYING.MIT file else when:
COPY_LIC_DIRS = "1"
COPY_LIC_MANIFEST = "1"
is set, we see eSDK failures from a pseudo abort.
[YOCTO #14366]
(From OE-Core rev: 46dd415720eb507a3d181a289b155ac4cfc2219c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 3eb580843de3f055e42fcce60b0f15c4190c0542)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/license.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index dc91118340..73f99e87a8 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
| @@ -31,8 +31,8 @@ python do_populate_lic() { | |||
| 31 | f.write("%s: %s\n" % (key, info[key])) | 31 | f.write("%s: %s\n" % (key, info[key])) |
| 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 '') + ' ' + d.getVar('COREBASE') + '/meta/COPYING').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: |