diff options
Diffstat (limited to 'dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch')
| -rw-r--r-- | dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch deleted file mode 100644 index f4cbcfbb7d38..000000000000 --- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 -From: "Anthony G. Basile" <blueness@gentoo.org> -Date: Sun, 18 Jan 2015 22:21:16 -0500 -Subject: [PATCH] Do not untar with --acls, fixes bug #536762 -To: gentoo-catalyst@lists.gentoo.org - ---- - modules/catalyst_support.py | 6 +++--- - modules/generic_stage_target.py | 18 +++++++++--------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py -index 0e9faac..702887d 100644 ---- a/modules/catalyst_support.py -+++ b/modules/catalyst_support.py -@@ -108,9 +108,9 @@ contents_map={ - # 'find' is disabled because it requires the source path, which is not - # always available - #"find" :[calc_contents,"find %(path)s"], -- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], -- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], -- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], -+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], -+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], -+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], - "isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], - # isoinfo-f should be a last resort only - "isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], -diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py -index c7db027..cc24c63 100644 ---- a/modules/generic_stage_target.py -+++ b/modules/generic_stage_target.py -@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - error_msg="Tarball extraction of "+\ - self.settings["source_path"]+" to "+\ -@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): - self.settings["chroot_path"]+\ - " (This may take some time) ...\n" - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ - self.settings["chroot_path"] - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --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." -@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): - "catalyst-hash") - destdir=self.settings["snapshot_cache_path"] - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --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"]+\ -@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): - cleanup_msg=\ - "Cleaning up existing portage tree (This can take a long time)..." - if "bz2" == self.settings["chroot_path"][-3:]: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - else: -- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ -+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ - self.settings["chroot_path"]+"/usr" - unpack_errmsg="Error unpacking snapshot" - -@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): - - print "Creating stage tarball..." - -- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ -+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ - self.settings["stage_path"]+" .",\ - "Couldn't create stage tarball",env=self.env) - --- -2.2.2 - |