Hi Alexandre, Again some stupid difference between gnu and posix... Can you leave me this revision so i will test it?
BR Piotr Wysyłane z aplikacji Outlook dla systemu iOS<https://aka.ms/o0ukef> ________________________________ Od: Alexandre Belloni <alexandre.bell...@bootlin.com> Wysłane: Saturday, August 12, 2023 3:03:54 PM Do: Piotr Łobacz <p.lob...@welotec.com> DW: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> Temat: Re: [OE-Core][PATCH v12 1/7] path.py: add support for ACLs and all additional attributes Hello, This went through the autobuilder fine until yesterday: https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fautobuilder.yoctoproject.org%2Ftyphoon%2F%23%2Fbuilders%2F117%2Fbuilds%2F3349%2Fsteps%2F12%2Flogs%2Fstdio&data=05%7C01%7Cp.lobacz%40welotec.com%7Ce8f1fc340a14425d3ef208db9b3495e3%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638274422388079435%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=N8x%2FfNthi1Uk30IwKIvqdnGFZBxl9VXJGvMBDdojWa8%3D&reserved=0<https://autobuilder.yoctoproject.org/typhoon/#/builders/117/builds/3349/steps/12/logs/stdio> https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fautobuilder.yocto.io%2Fpub%2Frepro-fail%2Foe-reproducible-20230811-vwiija9k%2Fpackages%2Fdiff-html%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Ce8f1fc340a14425d3ef208db9b3495e3%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638274422388079435%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=19uU%2FEieeXc6pztLj3zzxrF3eUgxCZgb0fjfqyiJe80%3D&reserved=0<https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20230811-vwiija9k/packages/diff-html/> On 04/08/2023 10:43:09+0200, Piotr Łobacz wrote: > Extend `tar` command inside copytree() and copyhardlinktree() functions, > with additional parameters, in order to support ACLs and xattr. The posix > format doesn't need to be set in here, as GNU tar switches to it whenewer > is uses --acls and/or --xattrs parameters. > > Additionaly change preservation of additional attributes for `cp` command > to all (meaning mode, ownership, timestamps etc.) not only xattrs, which > were previously. > > Signed-off-by: Piotr Łobacz <p.lob...@welotec.com> > --- > meta/lib/oe/path.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py > index 0dc8f172d5..56e8e214ac 100644 > --- a/meta/lib/oe/path.py > +++ b/meta/lib/oe/path.py > @@ -92,7 +92,7 @@ def copytree(src, dst): > # This way we also preserve hardlinks between files in the tree. > > bb.utils.mkdirhier(dst) > - cmd = "tar --xattrs --xattrs-include='*' -cf - -S -C %s -p . | tar > --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst) > + cmd = "tar --acls --xattrs --xattrs-include='*' -cf - -S -C %s -p . | > tar --acls --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst) > subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) > > def copyhardlinktree(src, dst): > @@ -119,7 +119,7 @@ def copyhardlinktree(src, dst): > if (canhard): > # Need to copy directories only with tar first since cp will error > if two > # writers try and create a directory at the same time > - cmd = "cd %s; find . -type d -print | tar --xattrs > --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar > --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst) > + cmd = "cd %s; find . -type d -print | tar --acls --xattrs > --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar > --acls --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst) > subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) > source = '' > if os.path.isdir(src): > @@ -130,7 +130,7 @@ def copyhardlinktree(src, dst): > else: > source = src > s_dir = os.getcwd() > - cmd = 'cp -afl --preserve=xattr %s %s' % (source, > os.path.realpath(dst)) > + cmd = 'cp -afl --preserve=all %s %s' % (source, > os.path.realpath(dst)) > subprocess.check_output(cmd, shell=True, cwd=s_dir, > stderr=subprocess.STDOUT) > else: > copytree(src, dst) > -- > 2.34.1 > > > > -- Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://eur04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbootlin.com%2F&data=05%7C01%7Cp.lobacz%40welotec.com%7Ce8f1fc340a14425d3ef208db9b3495e3%7C25111a7f1d5a4c51a4ca7f8e44011b39%7C0%7C0%7C638274422388079435%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=HkAEqLZj4x0KBFqFNI0N4Eq%2BiGVOdb6hVK93DW2Ev1U%3D&reserved=0<https://bootlin.com/>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#185856): https://lists.openembedded.org/g/openembedded-core/message/185856 Mute This Topic: https://lists.openembedded.org/mt/100542715/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
