From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6768880775710375936 X-Received: by 2002:aa7:d517:: with SMTP id y23mr39589962edq.213.1576002867282; Tue, 10 Dec 2019 10:34:27 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:907:385:: with SMTP id ss5ls4913683ejb.7.gmail; Tue, 10 Dec 2019 10:34:26 -0800 (PST) X-Google-Smtp-Source: APXvYqx+c/qgIMNpnxz9lQJq2hVll1GVAalH+OGUjmdb5i0FBnNiG5JCSnnuqYlS8dpucAMyWUlX X-Received: by 2002:a17:906:2444:: with SMTP id a4mr5370916ejb.134.1576002866651; Tue, 10 Dec 2019 10:34:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576002866; cv=none; d=google.com; s=arc-20160816; b=itjiONDZLw/GoMAgMutbAwVTP4CPJwzKrhtpyZtNJOvMOUAQ4u4CZ5rK39Seq/rjnT J8HTKaBwKWcgCnhMW4RzsIPCjMKYW6K1Q71pz3UFWC3kfu2kYf5vSw1gNrBGiA2wSDLH yctgJ7dcMY9JP59YBPJtlhuR0VfmLiMtjPYYsF14aTLgyGmFLjpWuQhvSl28/tzcg2lN lL1kyVokIR/Ufs90o2/2IPODpmDPbKMKdHATCYU4uHIAzQ1ZhfNi/Le7tuXzkScc9EQ2 juGVBA1tRB2mqrenjX7q6UYSCpEbQyV5vh1469vf0u3CS/hXh2e5CgSpHCplB8X/U6Jt Me8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=fm1a+FaEiAeIgueQCgwtYh9PplIq/fodq+jPNw6BJR4=; b=sMX0Q9Spl43gpUthWB02T5RrybkR2e005G4Il4bHmGy300sqOkJTA5DRv2K8feBu3t sQiIMSRmKMpT6M51jaW9+zqYK+sXG/w/bBOWME2wGglLe4Yo4A79J7y/SbqOg/icjMSL LtSEin410WQlnQFy3VkeHB+PUCJY+De0jZXqSUwiFKdy3K3soq9EXugET2/Xn2JvUjWi W/5wakh4Arpmu5YvNp0QNVyiM12lyrKACTNTukZHwfCJf8A+BWbyMsGaNmp4Ilx2YEdq ioYGqlTHZabmrNbBDk2dsLWfhQIXqW5dINb+dk97HPQVZQ69T65MvdGURUVHRwdgG+fu ry6w== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id ba12si125575edb.3.2019.12.10.10.34.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Dec 2019 10:34:26 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id xBAIYQ8M024223 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Dec 2019 19:34:26 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.25.68.37]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id xBAIYPkO002418 for ; Tue, 10 Dec 2019 19:34:26 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH 3/6] lib/oe/path.py: Align with OE-core regarding sparseness preservation Date: Tue, 10 Dec 2019 19:34:22 +0100 Message-Id: <16a4d7d0967575def869ccee2d3dfa5e95cfdfc6.1576002865.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: WkHgm4Ol5KTX From: Jan Kiszka 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 --- 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