From: Jan Kiszka <jan.kiszka@siemens.com>
To: isar-users <isar-users@googlegroups.com>
Subject: [PATCH 3/6] lib/oe/path.py: Align with OE-core regarding sparseness preservation
Date: Tue, 10 Dec 2019 19:34:22 +0100 [thread overview]
Message-ID: <16a4d7d0967575def869ccee2d3dfa5e95cfdfc6.1576002865.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1576002865.git.jan.kiszka@siemens.com>
In-Reply-To: <cover.1576002865.git.jan.kiszka@siemens.com>
From: Jan Kiszka <jan.kiszka@siemens.com>
This imports the changes of the OE-core commit
055402e5504f041c346571e243c7cf0894955cad
("sstate/lib.oe.path: Ensure file sparseness is preserved")
Other changes to this file just add functionality that we do not use.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
meta/lib/oe/path.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/lib/oe/path.py b/meta/lib/oe/path.py
index 515153d..90c87f5 100644
--- a/meta/lib/oe/path.py
+++ b/meta/lib/oe/path.py
@@ -90,7 +90,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 - -C %s -p . | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
+ cmd = "tar --xattrs --xattrs-include='*' -cf - -S -C %s -p . | tar --xattrs --xattrs-include='*' -xf - -C %s" % (src, dst)
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
def copyhardlinktree(src, dst):
@@ -102,7 +102,7 @@ def copyhardlinktree(src, dst):
if (os.stat(src).st_dev == os.stat(dst).st_dev):
# 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 - -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 --xattrs --xattrs-include='*' -cf - -S -C %s -p --no-recursion --files-from - | tar --xattrs --xattrs-include='*' -xhf - -C %s" % (src, src, dst)
subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
source = ''
if os.path.isdir(src):
--
2.16.4
next prev parent reply other threads:[~2019-12-10 18:34 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 18:34 [PATCH 0/6] OE alignments, including patch.bbclass Jan Kiszka
2019-12-10 18:34 ` [PATCH 1/6] lib/oe/path.py: Add GPLv2 header Jan Kiszka
2019-12-10 18:34 ` [PATCH 2/6] oe/path.py: copyhardlinktree: don't overwrite existing symlinks Jan Kiszka
2019-12-10 18:34 ` Jan Kiszka [this message]
2019-12-10 18:34 ` [PATCH 4/6] lib/oe/terminal.py: fix gnome-terminal start behavior Jan Kiszka
2019-12-10 18:34 ` [PATCH 5/6] oe.types.path: Use with to control file handle lifetime Jan Kiszka
2019-12-10 18:34 ` [PATCH 6/6] patch: Replace custom implementation with OE-core solution Jan Kiszka
2019-12-11 14:16 ` Jan Kiszka
2019-12-11 14:21 ` Baurzhan Ismagulov
2019-12-11 14:26 ` Jan Kiszka
2019-12-27 12:50 ` [PATCH 0/6] OE alignments, including patch.bbclass Baurzhan Ismagulov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=16a4d7d0967575def869ccee2d3dfa5e95cfdfc6.1576002865.git.jan.kiszka@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox