From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 39B75138CCF for ; Sun, 24 May 2015 00:08:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8BA9E0941; Sun, 24 May 2015 00:08:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DF55CE0923 for ; Sun, 24 May 2015 00:08:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E80F4340B34 for ; Sun, 24 May 2015 00:08:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A2C88A0E for ; Sun, 24 May 2015 00:08:31 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1427509967.e458b1d4d8c05da72702ba8e9a71028c9a5c9e0e.dolsen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/stagebase.py X-VCS-Directories: catalyst/base/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: e458b1d4d8c05da72702ba8e9a71028c9a5c9e0e X-VCS-Branch: master Date: Sun, 24 May 2015 00:08:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f9d865b6-e6a0-4012-9ef3-61d50074e86b X-Archives-Hash: 7228a8977acaa8ad6c8fbc1e86d9aa54 Message-ID: <20150524000831.-mnHGTh3Cv0Txe9r0XP1WmiV5XXgjkQEFG8AwXTjJBU@z> commit: e458b1d4d8c05da72702ba8e9a71028c9a5c9e0e Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo org> AuthorDate: Fri Dec 19 01:16:15 2014 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sat Mar 28 02:32:47 2015 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=e458b1d4 Continue commit 2fea87234ffc48c3dd96f1204b27f667f5ade3a3 as we need to use --xattr-include when extracting the stages. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> catalyst/base/stagebase.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index 4d9ff0d..dee947f 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -696,10 +696,10 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["chroot_path"]+\ " (This may take some time) ...\n" if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+\ self.settings["source_path"]+" to "+\ @@ -711,10 +711,10 @@ class StageBase(TargetBase, ClearBase, GenBase): self.settings["chroot_path"]+\ " (This may take some time) ...\n" if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] else: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ self.settings["chroot_path"] error_msg="Tarball extraction of "+self.settings["source_path"]+\ " to "+self.settings["chroot_path"]+" failed." @@ -806,9 +806,9 @@ class StageBase(TargetBase, ClearBase, GenBase): "catalyst-hash") destdir=self.settings["snapshot_cache_path"] if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir else: - unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+destdir + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir unpack_errmsg="Error unpacking snapshot" cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ self.settings["snapshot_cache_path"]+\ @@ -825,10 +825,10 @@ class StageBase(TargetBase, ClearBase, GenBase): cleanup_msg=\ "Cleaning up existing portage tree (This can take a long time)..." if "bz2" == self.settings["chroot_path"][-3:]: - unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ self.settings["chroot_path"]+"/usr" else: - unpack_cmd="tar --xattrs --acls -xpf "+self.settings["snapshot_path"]+" -C "+\ + unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ self.settings["chroot_path"]+"/usr" unpack_errmsg="Error unpacking snapshot" @@ -1248,7 +1248,7 @@ class StageBase(TargetBase, ClearBase, GenBase): print "Creating stage tarball..." - cmd("tar --xattrs --acls -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ + cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ self.settings["stage_path"]+" .",\ "Couldn't create stage tarball",env=self.env)