diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-12-22 19:08:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-24 08:25:14 +0000 |
commit | 7068df34ce04ddcbc19e8514c8b87cc99e4f086e (patch) | |
tree | b551351b5f0f53720625503c6aebb1767aac6170 | |
parent | c74ec1dd7393b9dc7bec1a3ca2ed0a56fb18d8fb (diff) | |
download | poky-7068df34ce04ddcbc19e8514c8b87cc99e4f086e.tar.gz |
license.bbclass: Add COMMON_LICENSE_DIR and LICENSE_PATH dirs to PSEUDO_IGNORE_PATHS
* now without ${COREBASE}/meta in PSEUDO_IGNORE_PATHS after:
73d538f207 bitbake.conf: Prevent pyc file generation in pseudo context
the do_package tasks are failing when LICENSE_CREATE_PACKAGE is enabled
pseudo.log shows that it's because of license texts copied from
${COREBASE}/meta:
path mismatch [46 links]: ino 96733640 db '/OE/build/tmp-glibc/work/all-oe-linux/foo/1.0/image/usr/share/licenses/foo/generic_Apache-2.0' req '/OE/build/openembedded-core/meta/files/common-licenses/Apache-2.0'.
(From OE-Core rev: 39423a33595e7ade82fc88f55823660f8532cb84)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/license.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index f90176d6c0..dc91118340 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass | |||
@@ -31,6 +31,7 @@ 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 | # 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 |
35 | python perform_packagecopy_prepend () { | 36 | python perform_packagecopy_prepend () { |
36 | enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) | 37 | enabled = oe.data.typed_value('LICENSE_CREATE_PACKAGE', d) |