[gatesgarth][PATCH] license_image.bbclass: Don't attempt to symlink to the same file

[gatesgarth][PATCH] license_image.bbclass: Don't attempt to symlink to the same file

[Mike Looijmans]

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.

Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl>
---
 meta/classes/license_image.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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):
             os.unlink(lic_manifest_symlink_dir)
 
         # create the image dir symlink
-        os.symlink(lic_manifest_dir, lic_manifest_symlink_dir)
+        if lic_manifest_dir != lic_manifest_symlink_dir:
+            os.symlink(lic_manifest_dir, lic_manifest_symlink_dir)
 
 def get_deployed_dependencies(d):
     """
-- 
2.17.1

Re: [OE-core] [gatesgarth][PATCH] license_image.bbclass: Don't attempt to symlink to the same file

[Anuj Mittal]

On Fri, 2021-02-05 at 15:24 +0100, Mike Looijmans wrote:
> 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.

Is this not required in master branch? I can't see this change there.

Thanks,

Anuj

Re: [OE-core] [gatesgarth][PATCH] license_image.bbclass: Don't attempt to symlink to the same file

[Mike Looijmans]

Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topicproducts.com

Please consider the environment before printing this e-mail
On 05-02-2021 15:44, Mittal, Anuj wrote:
> On Fri, 2021-02-05 at 15:24 +0100, Mike Looijmans wrote:
>> 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.
> Is this not required in master branch? I can't see this change there.

Probably yes, too.

And half the commit message got lost somewhere. I'll try a resend...


-- 
Mike Looijmans

Re: [OE-core] [gatesgarth][PATCH] license_image.bbclass: Don't attempt to symlink to the same file

[Mike Looijmans]

Met vriendelijke groet / kind regards,

Mike Looijmans
System Expert


TOPIC Embedded Products B.V.
Materiaalweg 4, 5681 RJ Best
The Netherlands

T: +31 (0) 499 33 69 69
E: mike.looijmans@topicproducts.com
W: www.topicproducts.com

Please consider the environment before printing this e-mail
On 05-02-2021 15:51, Mike Looijmans via lists.openembedded.org wrote:
> On 05-02-2021 15:44, Mittal, Anuj wrote:
>> On Fri, 2021-02-05 at 15:24 +0100, Mike Looijmans wrote:
>>> 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.
>> Is this not required in master branch? I can't see this change there.
>
> Probably yes, too.
>
> And half the commit message got lost somewhere. I'll try a resend...

Oh weird... Apparently the company mailserver that did that. The version 
on the list is okay, the one in my mailbox lacks the first half of the 
commit text. Same with the v2 mail.


-- 
Mike Looijmans