]> code.ossystems Code Review - openembedded-core.git/commitdiff
license_image.bbclass: Fix symlink to the image license manifest dir creation
authorDiego Sueiro <diego.sueiro@arm.com>
Fri, 11 Sep 2020 11:30:27 +0000 (12:30 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 11 Sep 2020 16:59:56 +0000 (17:59 +0100)
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>
meta/classes/license_image.bbclass

index 682d46237f27bba1dc5924dc62efadaa5a3f2bbe..702e9f9c55a719f1cb23028d2f74dbd6e6187d7d 100644 (file)
@@ -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):
     """