diff options
author | Mike Looijmans <mike.looijmans@topic.nl> | 2021-02-05 15:53:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-11 17:46:12 +0000 |
commit | 86c5922ebc891162566904926ac442a97a3e8225 (patch) | |
tree | e35ebf20d5e871ab9a0eddab6e4f9396d3cfc646 /meta | |
parent | a367523b55ed04d17a877dd9582ca89e40f97eac (diff) | |
download | poky-86c5922ebc891162566904926ac442a97a3e8225.tar.gz |
license_image.bbclass: Don't attempt to symlink to the same file
Sometimes (that is, in all my builds) the lic_manifest_dir and
lic_manifest_symlink_dir end up pointing to the same file, resulting
in an error like this:
Exception: FileExistsError: [Errno 17] File exists: '/.../tmp-glibc/deploy/licenses/my-image-tdkz15' -> '/.../tmp-glibc/deploy/licenses/my-image-tdkz15'
First check to see if this is the case before attempting to create
the link.
(From OE-Core rev: a378ec0fc2a07797310b4cd29f9f0cd88b042158)
Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 50f83fb542065eaf7a20ac07b63ae06441ada180)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/license_image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 119c8dfc86..6f478ce22c 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass | |||
@@ -210,7 +210,8 @@ def license_deployed_manifest(d): | |||
210 | os.unlink(lic_manifest_symlink_dir) | 210 | os.unlink(lic_manifest_symlink_dir) |
211 | 211 | ||
212 | # create the image dir symlink | 212 | # create the image dir symlink |
213 | os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) | 213 | if lic_manifest_dir != lic_manifest_symlink_dir: |
214 | os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) | ||
214 | 215 | ||
215 | def get_deployed_dependencies(d): | 216 | def get_deployed_dependencies(d): |
216 | """ | 217 | """ |