diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-10-31 16:59:43 +1300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-16 10:33:32 +0000 |
| commit | 650ddf1d8b687845099a8ac463c3a550a7965095 (patch) | |
| tree | 11fa49f8561009ebad816af2d3e87c48ecd5f88c /meta/classes | |
| parent | 87d6ccd8c7775b1d3e2571b6e17091538a8bd6c8 (diff) | |
| download | openembedded-core-650ddf1d8b687845099a8ac463c3a550a7965095.tar.gz openembedded-core-650ddf1d8b687845099a8ac463c3a550a7965095.tar.bz2 openembedded-core-650ddf1d8b687845099a8ac463c3a550a7965095.zip | |
classes/license: fix handling of symlinks pointed to in LIC_FILES_CHKSUM
If you set LIC_FILES_CHKSUM to point to a relative symlink then you'll
get "Could not copy license file" warnings in copy_license_files() since
the symlink won't be valid after it's copied. If the source is a symlink
then we need to dereference it first.
I encountered this when I used recipetool on the sources for capnproto,
where the c++ directory contains a LICENSE.txt symlink to the LICENSE
file in the parent directory, and this symlink ends up being pointed to
in LIC_FILES_CHKSUM.
(From OE-Core rev: c4d3b1e9c37b920444e53d3231552da18d101882)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/license.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index da4fc3e1d4..660b85f619 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -351,6 +351,8 @@ def copy_license_files(lic_files_paths, destdir): dst = os.path.join(destdir, basename) if os.path.exists(dst): os.remove(dst) + if os.path.islink(src): + src = os.path.realpath(src) canlink = os.access(src, os.W_OK) and (os.stat(src).st_dev == os.stat(destdir).st_dev) if canlink: try: |