diff options
| author |   Diego Sueiro <diego.sueiro@arm.com> | 2020-09-11 12:30:27 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-11 17:59:56 +0100 |
| commit | b54d92235408abdf0ba75a4d46329ec992af6006 (patch) | |
| tree | bc2dc344b68d172d0c19dca4e7aeb9d1fac3125c /meta/classes | |
| parent | 3e729e918ca7f42446517abfcd1eced72db7a7f1 (diff) | |
| download | openembedded-core-contrib-b54d92235408abdf0ba75a4d46329ec992af6006.tar.gz | |
license_image.bbclass: Fix symlink to the image license manifest dir creation
If IMAGE_LINK_NAME is empty don't try to create the symlink.
[YOCTO #14042]
Signed-off-by: Diego Sueiro <diego.sueiro@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/license_image.bbclass | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 682d46237f..702e9f9c55 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass @@ -200,14 +200,16 @@ def license_deployed_manifest(d): image_license_manifest = os.path.join(lic_manifest_dir, 'image_license.manifest') write_license_files(d, image_license_manifest, man_dic, rootfs=False) - lic_manifest_symlink_dir = os.path.join(d.getVar('LICENSE_DIRECTORY'), - d.getVar('IMAGE_LINK_NAME')) - # remove old symlink - if os.path.islink(lic_manifest_symlink_dir): - os.unlink(lic_manifest_symlink_dir) - - # create the image dir symlink - os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) + link_name = d.getVar('IMAGE_LINK_NAME') + if link_name: + lic_manifest_symlink_dir = os.path.join(d.getVar('LICENSE_DIRECTORY'), + link_name) + # remove old symlink + if os.path.islink(lic_manifest_symlink_dir): + os.unlink(lic_manifest_symlink_dir) + + # create the image dir symlink + os.symlink(lic_manifest_dir, lic_manifest_symlink_dir) def get_deployed_dependencies(d): """ |