From b54d92235408abdf0ba75a4d46329ec992af6006 Mon Sep 17 00:00:00 2001 From: Diego Sueiro Date: Fri, 11 Sep 2020 12:30:27 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/license_image.bbclass | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'meta/classes/license_image.bbclass') 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): """ -- cgit 1.2.3-korg