| 1 |
dolsen 15/01/30 17:40:20 |
| 2 |
|
| 3 |
Added: catalyst-2.0.18-Do-notuntarwith--acls.patch |
| 4 |
Log: |
| 5 |
Bump patched 2.0.18 |
| 6 |
|
| 7 |
(Portage version: 2.2.15/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 0x65E309F2189DB0B8) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: catalyst-2.0.18-Do-notuntarwith--acls.patch |
| 16 |
=================================================================== |
| 17 |
From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001 |
| 18 |
From: "Anthony G. Basile" <blueness@g.o> |
| 19 |
Date: Sun, 18 Jan 2015 22:21:16 -0500 |
| 20 |
Subject: [PATCH] Do not untar with --acls, fixes bug #536762 |
| 21 |
To: gentoo-catalyst@l.g.o |
| 22 |
|
| 23 |
--- |
| 24 |
modules/catalyst_support.py | 6 +++--- |
| 25 |
modules/generic_stage_target.py | 18 +++++++++--------- |
| 26 |
2 files changed, 12 insertions(+), 12 deletions(-) |
| 27 |
|
| 28 |
diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py |
| 29 |
index 0e9faac..702887d 100644 |
| 30 |
--- a/modules/catalyst_support.py |
| 31 |
+++ b/modules/catalyst_support.py |
| 32 |
@@ -108,9 +108,9 @@ contents_map={ |
| 33 |
# 'find' is disabled because it requires the source path, which is not |
| 34 |
# always available |
| 35 |
#"find" :[calc_contents,"find %(path)s"], |
| 36 |
- "tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"], |
| 37 |
- "tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"], |
| 38 |
- "tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"], |
| 39 |
+ "tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"], |
| 40 |
+ "tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"], |
| 41 |
+ "tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"], |
| 42 |
"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"], |
| 43 |
# isoinfo-f should be a last resort only |
| 44 |
"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"], |
| 45 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 46 |
index c7db027..cc24c63 100644 |
| 47 |
--- a/modules/generic_stage_target.py |
| 48 |
+++ b/modules/generic_stage_target.py |
| 49 |
@@ -660,10 +660,10 @@ class generic_stage_target(generic_target): |
| 50 |
self.settings["chroot_path"]+\ |
| 51 |
" (This may take some time) ...\n" |
| 52 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 53 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 54 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 55 |
self.settings["chroot_path"] |
| 56 |
else: |
| 57 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 58 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 59 |
self.settings["chroot_path"] |
| 60 |
error_msg="Tarball extraction of "+\ |
| 61 |
self.settings["source_path"]+" to "+\ |
| 62 |
@@ -675,10 +675,10 @@ class generic_stage_target(generic_target): |
| 63 |
self.settings["chroot_path"]+\ |
| 64 |
" (This may take some time) ...\n" |
| 65 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 66 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 67 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 68 |
self.settings["chroot_path"] |
| 69 |
else: |
| 70 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 71 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\ |
| 72 |
self.settings["chroot_path"] |
| 73 |
error_msg="Tarball extraction of "+self.settings["source_path"]+\ |
| 74 |
" to "+self.settings["chroot_path"]+" failed." |
| 75 |
@@ -777,9 +777,9 @@ class generic_stage_target(generic_target): |
| 76 |
"catalyst-hash") |
| 77 |
destdir=self.settings["snapshot_cache_path"] |
| 78 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 79 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 80 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 81 |
else: |
| 82 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 83 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir |
| 84 |
unpack_errmsg="Error unpacking snapshot" |
| 85 |
cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\ |
| 86 |
self.settings["snapshot_cache_path"]+\ |
| 87 |
@@ -796,10 +796,10 @@ class generic_stage_target(generic_target): |
| 88 |
cleanup_msg=\ |
| 89 |
"Cleaning up existing portage tree (This can take a long time)..." |
| 90 |
if "bz2" == self.settings["chroot_path"][-3:]: |
| 91 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 92 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 93 |
self.settings["chroot_path"]+"/usr" |
| 94 |
else: |
| 95 |
- unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 96 |
+ unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\ |
| 97 |
self.settings["chroot_path"]+"/usr" |
| 98 |
unpack_errmsg="Error unpacking snapshot" |
| 99 |
|
| 100 |
@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target): |
| 101 |
|
| 102 |
print "Creating stage tarball..." |
| 103 |
|
| 104 |
- cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
| 105 |
+ cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\ |
| 106 |
self.settings["stage_path"]+" .",\ |
| 107 |
"Couldn't create stage tarball",env=self.env) |
| 108 |
|
| 109 |
-- |
| 110 |
2.2.2 |
Archives