Patchwork [1/1] archiver.bbclass: exclude recursive symlink for diff

login
register
mail settings
Submitter Robert Yang
Date Sept. 3, 2013, 11:51 a.m.
Message ID <de9091dfe0d902de86a95fa1856c44f7fc4e6544.1378208967.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/57273/
State New
Headers show

Comments

Robert Yang - Sept. 3, 2013, 11:51 a.m.
There would be errors if there are recursive symlinks in the ${S}:

diff: /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem: recursive directory loop

We can check the recursive symlink and save it to the exclude file, then
the diff's --exclude-from argument can exclude them

[YOCTO #4986]

Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/archiver.bbclass |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
Robert Yang - Sept. 3, 2013, 12:51 p.m.
Please hold this patch for a while, seems that it didn't fix all of the things.

// Robert

On 09/03/2013 07:51 PM, Robert Yang wrote:
> There would be errors if there are recursive symlinks in the ${S}:
>
> diff: /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem: recursive directory loop
>
> We can check the recursive symlink and save it to the exclude file, then
> the diff's --exclude-from argument can exclude them
>
> [YOCTO #4986]
>
> Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   meta/classes/archiver.bbclass |   18 ++++++++++++++++++
>   1 file changed, 18 insertions(+)
>
> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
> index 66efe7d..f5ad562 100644
> --- a/meta/classes/archiver.bbclass
> +++ b/meta/classes/archiver.bbclass
> @@ -493,6 +493,24 @@ def create_diff_gz(d):
>       for i in exclude_from:
>           f.write(i)
>           f.write("\n")
> +
> +    symlinks = []
> +    directories = []
> +
> +    # Add symlink and root dir to the separated lists for checking whether
> +    # there is recursive symlink
> +    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
> +        if os.path.islink(root):
> +            symlinks.append(root)
> +        elif os.path.isdir(root):
> +            directories.append(root)
> +
> +    # Check if there is a recursive symlink to a dir
> +    for sym in symlinks:
> +        if sym in directories:
> +            # write the 'sym' in the 'exclude-from' file
> +            f.write(os.path.basename(sym))
> +
>       f.close()
>
>       s=d.getVar('S', True)
>
Vali Cobelea - Sept. 3, 2013, 12:53 p.m.
Hi,

What seems to be the issue ?

BR,
Valentin


On 09/03/2013 03:51 PM, Robert Yang wrote:
>
> Please hold this patch for a while, seems that it didn't fix all of 
> the things.
>
> // Robert
>
> On 09/03/2013 07:51 PM, Robert Yang wrote:
>> There would be errors if there are recursive symlinks in the ${S}:
>>
>> diff: 
>> /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem: 
>> recursive directory loop
>>
>> We can check the recursive symlink and save it to the exclude file, then
>> the diff's --exclude-from argument can exclude them
>>
>> [YOCTO #4986]
>>
>> Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>>   meta/classes/archiver.bbclass |   18 ++++++++++++++++++
>>   1 file changed, 18 insertions(+)
>>
>> diff --git a/meta/classes/archiver.bbclass 
>> b/meta/classes/archiver.bbclass
>> index 66efe7d..f5ad562 100644
>> --- a/meta/classes/archiver.bbclass
>> +++ b/meta/classes/archiver.bbclass
>> @@ -493,6 +493,24 @@ def create_diff_gz(d):
>>       for i in exclude_from:
>>           f.write(i)
>>           f.write("\n")
>> +
>> +    symlinks = []
>> +    directories = []
>> +
>> +    # Add symlink and root dir to the separated lists for checking 
>> whether
>> +    # there is recursive symlink
>> +    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
>> +        if os.path.islink(root):
>> +            symlinks.append(root)
>> +        elif os.path.isdir(root):
>> +            directories.append(root)
>> +
>> +    # Check if there is a recursive symlink to a dir
>> +    for sym in symlinks:
>> +        if sym in directories:
>> +            # write the 'sym' in the 'exclude-from' file
>> +            f.write(os.path.basename(sym))
>> +
>>       f.close()
>>
>>       s=d.getVar('S', True)
>>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Robert Yang - Sept. 4, 2013, 12:57 a.m.
Hi Valentin,

It hangs up when build acl (which means that I can reproduce the
problem as you have told), but it worked well without this patch,
maybe python version related, I will do more investigation.

// Robert

On 09/03/2013 08:53 PM, Vali Cobelea wrote:
> Hi,
>
> What seems to be the issue ?
>
> BR,
> Valentin
>
>
> On 09/03/2013 03:51 PM, Robert Yang wrote:
>>
>> Please hold this patch for a while, seems that it didn't fix all of the things.
>>
>> // Robert
>>
>> On 09/03/2013 07:51 PM, Robert Yang wrote:
>>> There would be errors if there are recursive symlinks in the ${S}:
>>>
>>> diff:
>>> /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem:
>>> recursive directory loop
>>>
>>> We can check the recursive symlink and save it to the exclude file, then
>>> the diff's --exclude-from argument can exclude them
>>>
>>> [YOCTO #4986]
>>>
>>> Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>> ---
>>>   meta/classes/archiver.bbclass |   18 ++++++++++++++++++
>>>   1 file changed, 18 insertions(+)
>>>
>>> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
>>> index 66efe7d..f5ad562 100644
>>> --- a/meta/classes/archiver.bbclass
>>> +++ b/meta/classes/archiver.bbclass
>>> @@ -493,6 +493,24 @@ def create_diff_gz(d):
>>>       for i in exclude_from:
>>>           f.write(i)
>>>           f.write("\n")
>>> +
>>> +    symlinks = []
>>> +    directories = []
>>> +
>>> +    # Add symlink and root dir to the separated lists for checking whether
>>> +    # there is recursive symlink
>>> +    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
>>> +        if os.path.islink(root):
>>> +            symlinks.append(root)
>>> +        elif os.path.isdir(root):
>>> +            directories.append(root)
>>> +
>>> +    # Check if there is a recursive symlink to a dir
>>> +    for sym in symlinks:
>>> +        if sym in directories:
>>> +            # write the 'sym' in the 'exclude-from' file
>>> +            f.write(os.path.basename(sym))
>>> +
>>>       f.close()
>>>
>>>       s=d.getVar('S', True)
>>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
Vali Cobelea - Sept. 4, 2013, 7:22 a.m.
Hi,

You can try even without the patch and see if you reproduce the issue.
We do have the symlinks recursivity problem as I said but on random 
packages, "udev" was the first we noticed.

Best regards,
Valentin

On 09/04/2013 03:57 AM, Robert Yang wrote:
>
> Hi Valentin,
>
> It hangs up when build acl (which means that I can reproduce the
> problem as you have told), but it worked well without this patch,
> maybe python version related, I will do more investigation.
>
> // Robert
>
> On 09/03/2013 08:53 PM, Vali Cobelea wrote:
>> Hi,
>>
>> What seems to be the issue ?
>>
>> BR,
>> Valentin
>>
>>
>> On 09/03/2013 03:51 PM, Robert Yang wrote:
>>>
>>> Please hold this patch for a while, seems that it didn't fix all of 
>>> the things.
>>>
>>> // Robert
>>>
>>> On 09/03/2013 07:51 PM, Robert Yang wrote:
>>>> There would be errors if there are recursive symlinks in the ${S}:
>>>>
>>>> diff:
>>>> /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem: 
>>>>
>>>> recursive directory loop
>>>>
>>>> We can check the recursive symlink and save it to the exclude file, 
>>>> then
>>>> the diff's --exclude-from argument can exclude them
>>>>
>>>> [YOCTO #4986]
>>>>
>>>> Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>> ---
>>>>   meta/classes/archiver.bbclass |   18 ++++++++++++++++++
>>>>   1 file changed, 18 insertions(+)
>>>>
>>>> diff --git a/meta/classes/archiver.bbclass 
>>>> b/meta/classes/archiver.bbclass
>>>> index 66efe7d..f5ad562 100644
>>>> --- a/meta/classes/archiver.bbclass
>>>> +++ b/meta/classes/archiver.bbclass
>>>> @@ -493,6 +493,24 @@ def create_diff_gz(d):
>>>>       for i in exclude_from:
>>>>           f.write(i)
>>>>           f.write("\n")
>>>> +
>>>> +    symlinks = []
>>>> +    directories = []
>>>> +
>>>> +    # Add symlink and root dir to the separated lists for checking 
>>>> whether
>>>> +    # there is recursive symlink
>>>> +    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
>>>> +        if os.path.islink(root):
>>>> +            symlinks.append(root)
>>>> +        elif os.path.isdir(root):
>>>> +            directories.append(root)
>>>> +
>>>> +    # Check if there is a recursive symlink to a dir
>>>> +    for sym in symlinks:
>>>> +        if sym in directories:
>>>> +            # write the 'sym' in the 'exclude-from' file
>>>> +            f.write(os.path.basename(sym))
>>>> +
>>>>       f.close()
>>>>
>>>>       s=d.getVar('S', True)
>>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>
>>
Robert Yang - Sept. 4, 2013, 8:01 a.m.
On 09/04/2013 03:22 PM, Vali Cobelea wrote:
> Hi,
>
> You can try even without the patch and see if you reproduce the issue.
> We do have the symlinks recursivity problem as I said but on random packages,
> "udev" was the first we noticed.

I can't reproduce the error, but it is really a problem, I've added a patch
in the bugzilla, and will send it here sooner.

// Robert

>
> Best regards,
> Valentin
>
> On 09/04/2013 03:57 AM, Robert Yang wrote:
>>
>> Hi Valentin,
>>
>> It hangs up when build acl (which means that I can reproduce the
>> problem as you have told), but it worked well without this patch,
>> maybe python version related, I will do more investigation.
>>
>> // Robert
>>
>> On 09/03/2013 08:53 PM, Vali Cobelea wrote:
>>> Hi,
>>>
>>> What seems to be the issue ?
>>>
>>> BR,
>>> Valentin
>>>
>>>
>>> On 09/03/2013 03:51 PM, Robert Yang wrote:
>>>>
>>>> Please hold this patch for a while, seems that it didn't fix all of the things.
>>>>
>>>> // Robert
>>>>
>>>> On 09/03/2013 07:51 PM, Robert Yang wrote:
>>>>> There would be errors if there are recursive symlinks in the ${S}:
>>>>>
>>>>> diff:
>>>>> /xxx/udev/182-r8/udev-182/test/sys/block/loop0/bdi/subsystem/0:16/subsystem:
>>>>> recursive directory loop
>>>>>
>>>>> We can check the recursive symlink and save it to the exclude file, then
>>>>> the diff's --exclude-from argument can exclude them
>>>>>
>>>>> [YOCTO #4986]
>>>>>
>>>>> Signed-off-by: Valentin Cobelea <valentin.cobelea@enea.com>
>>>>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>>>>> ---
>>>>>   meta/classes/archiver.bbclass |   18 ++++++++++++++++++
>>>>>   1 file changed, 18 insertions(+)
>>>>>
>>>>> diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
>>>>> index 66efe7d..f5ad562 100644
>>>>> --- a/meta/classes/archiver.bbclass
>>>>> +++ b/meta/classes/archiver.bbclass
>>>>> @@ -493,6 +493,24 @@ def create_diff_gz(d):
>>>>>       for i in exclude_from:
>>>>>           f.write(i)
>>>>>           f.write("\n")
>>>>> +
>>>>> +    symlinks = []
>>>>> +    directories = []
>>>>> +
>>>>> +    # Add symlink and root dir to the separated lists for checking whether
>>>>> +    # there is recursive symlink
>>>>> +    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
>>>>> +        if os.path.islink(root):
>>>>> +            symlinks.append(root)
>>>>> +        elif os.path.isdir(root):
>>>>> +            directories.append(root)
>>>>> +
>>>>> +    # Check if there is a recursive symlink to a dir
>>>>> +    for sym in symlinks:
>>>>> +        if sym in directories:
>>>>> +            # write the 'sym' in the 'exclude-from' file
>>>>> +            f.write(os.path.basename(sym))
>>>>> +
>>>>>       f.close()
>>>>>
>>>>>       s=d.getVar('S', True)
>>>>>
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>>
>>>
>
>
>

Patch

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 66efe7d..f5ad562 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -493,6 +493,24 @@  def create_diff_gz(d):
     for i in exclude_from:
         f.write(i)
         f.write("\n")
+
+    symlinks = []
+    directories = []
+
+    # Add symlink and root dir to the separated lists for checking whether
+    # there is recursive symlink
+    for root, dirs, files in os.walk(os.getcwd(), followlinks=True):
+        if os.path.islink(root):
+            symlinks.append(root)
+        elif os.path.isdir(root):
+            directories.append(root)
+
+    # Check if there is a recursive symlink to a dir
+    for sym in symlinks:
+        if sym in directories:
+            # write the 'sym' in the 'exclude-from' file
+            f.write(os.path.basename(sym))
+
     f.close()
 
     s=d.getVar('S', True)