* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-03-24 16:08 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-03-24 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 12c985f89515f17d59107c35d8e9c76f3735f80a
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 03:32:29 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:08 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=12c985f8
Fix undefined variable: RLIMIT_NOFILE
It was not imported from resource, it was also not used correctly.
---
modules/catalyst_support.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 316dfa3..d493f88 100644
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -6,14 +6,16 @@ selinux_capable = False
#fakeroot_capable = False
BASH_BINARY = "/bin/bash"
+# set it to 0 for the soft limit, 1 for the hard limit
+DESIRED_RLIMIT = 0
try:
- import resource
- max_fd_limit=resource.getrlimit(RLIMIT_NOFILE)
+ import resource
+ max_fd_limit=resource.getrlimit(resource.RLIMIT_NOFILE)[DESIRED_RLIMIT]
except SystemExit, e:
- raise
+ raise
except:
- # hokay, no resource module.
- max_fd_limit=256
+ # hokay, no resource module.
+ max_fd_limit=256
# pids this process knows of.
spawned_pids = []
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2015-01-19 3:19 Anthony G. Basile
0 siblings, 0 replies; 13+ messages in thread
From: Anthony G. Basile @ 2015-01-19 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 45286727a63d16d0688a88bf7cf68289efd26861
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 19 03:21:16 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Jan 19 03:21:16 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=45286727
Do not untar with --acls, fixes bug #536762
---
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)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-12-19 1:23 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 13+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-12-19 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 2196cb1fdc76caa3249109f2b433de2d378968e5
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 19 01:16:15 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 19 01:16:15 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2196cb1f
Continue commit 2fea87234ffc48c3dd96f1204b27f667f5ade3a3 as we need to use --xattr-include when extracting the stages.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
---
modules/generic_stage_target.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 7fa696a..c7db027 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 --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 "+\
@@ -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 --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."
@@ -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 --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"]+\
@@ -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 --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"
@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
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)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-12-06 17:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 13+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-12-06 17:37 UTC (permalink / raw
To: gentoo-commits
commit: 2a64b3a8a9a609f1c4b6546d245dc2f869d9790a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 6 17:30:01 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Dec 6 17:30:01 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2a64b3a8
Use -xpf instead of xpf with tar so it doesn't complain about missing option.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
---
modules/generic_stage_target.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 62f532b..7fa696a 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -779,7 +779,7 @@ class generic_stage_target(generic_target):
if "bz2" == self.settings["chroot_path"][-3:]:
unpack_cmd="tar --xattrs --acls -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 --acls -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"]+\
@@ -799,7 +799,7 @@ class generic_stage_target(generic_target):
unpack_cmd="tar --xattrs --acls -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 --acls -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
unpack_errmsg="Error unpacking snapshot"
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-12-06 16:56 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 13+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2014-12-06 16:56 UTC (permalink / raw
To: gentoo-commits
commit: 2fea87234ffc48c3dd96f1204b27f667f5ade3a3
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 6 16:48:27 2014 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Dec 6 16:48:27 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=2fea8723
Add --xattrs and --acls to the tar calls so we don't lose file properties while building the stages - should fix bug 531788.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> 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 8112ed0..0e9faac 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 tvf %(file)s"],
- "tar-tvz":[calc_contents,"tar tvzf %(file)s"],
- "tar-tvj":[calc_contents,"tar -I lbzip2 -tvf %(file)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"],
"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 6852b7e..62f532b 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 -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -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 -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
self.settings["chroot_path"]
else:
- unpack_cmd="tar -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -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 -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
else:
- unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+destdir
+ unpack_cmd="tar --xattrs --acls 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 -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
self.settings["chroot_path"]+"/usr"
else:
- unpack_cmd="tar xpf "+self.settings["snapshot_path"]+" -C "+\
+ unpack_cmd="tar --xattrs --acls 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 -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
+ cmd("tar --xattrs --acls -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
self.settings["stage_path"]+" .",\
"Couldn't create stage tarball",env=self.env)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-05-16 19:15 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-05-16 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 90a7a7b7858db642ec51cd5fac4c2432adb05533
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May 16 19:09:48 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Fri May 16 19:09:48 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=90a7a7b7
modules/catalyst_support.py: Update snakeoil import path change
---
modules/catalyst_support.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index d493f88..8112ed0 100644
--- a/modules/catalyst_support.py
+++ b/modules/catalyst_support.py
@@ -620,8 +620,8 @@ def read_makeconf(mymakeconffile):
if os.path.exists(mymakeconffile):
try:
try:
- import snakeoil.fileutils
- return snakeoil.fileutils.read_bash_dict(mymakeconffile, sourcing_command="source")
+ import snakeoil.bash #import snakeoil.fileutils
+ return snakeoil.bash.read_bash_dict(mymakeconffile, sourcing_command="source")
except ImportError:
try:
import portage.util
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-04-05 7:36 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-04-05 7:36 UTC (permalink / raw
To: gentoo-commits
commit: a1f457e311ee67dbfcd330ffcabeaa9beaeeb55c
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 5 07:35:05 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Sat Apr 5 07:35:05 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=a1f457e3
generic_stage_target: Add a trailing / to the cp /etc/reolv.conf command
---
modules/generic_stage_target.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 530f7ee..6852b7e 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -996,7 +996,7 @@ class generic_stage_target(generic_target):
#self.makeconf=read_makeconf(self.settings["chroot_path"]+"/etc/portage/make.conf")
- cmd("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc",\
+ cmd("cp /etc/resolv.conf " + self.settings["chroot_path"] + "/etc/",
"Could not copy resolv.conf into place.",env=self.env)
""" Copy over the envscript, if applicable """
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-03-24 16:08 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-03-24 16:08 UTC (permalink / raw
To: gentoo-commits
commit: f96f9265af16a9bdce3fe7d74c995e76bac8f1cf
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 3 05:18:02 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Mar 24 16:07:07 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=f96f9265
Allow kernelopts as a valid value for kernels.
---
modules/generic_stage_target.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 37d1fa1..530f7ee 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -579,6 +579,7 @@ class generic_stage_target(generic_target):
self.valid_values.append("boot/kernel/"+x+"/softlevel")
self.valid_values.append("boot/kernel/"+x+"/use")
self.valid_values.append("boot/kernel/"+x+"/packages")
+ self.valid_values.append("boot/kernel/"+x+"/kernelopts")
if "boot/kernel/"+x+"/packages" in addlargs:
if type(addlargs["boot/kernel/"+x+\
"/packages"])==types.StringType:
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-01-01 22:03 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-01-01 22:03 UTC (permalink / raw
To: gentoo-commits
commit: e1dffd789f91235190b12f78edb5d1e262affb27
Author: Douglas Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Wed Jan 1 21:18:22 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jan 1 22:03:11 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=e1dffd78
Mount /dev/shm in the chroot with the right options
Bind mounting /dev/shm into the chroot isn't a good idea, as there may
be collisions and result in weird side effects. Instead, we can just
mount a new tmpfs there, with the right options to ensure security.
---
modules/generic_stage_target.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 9edafe9..37d1fa1 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -179,13 +179,13 @@ class generic_stage_target(generic_target):
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
- "/dev/shm": "/dev/shm"}
+ "/dev/shm": "shmfs"}
else:
self.mounts=["/proc", "/dev", "/usr/portage/distfiles",
"/var/tmp/portage"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
- "/dev/shm": "/dev/shm"}
+ "/dev/shm": "shmfs"}
if os.uname()[0] == "Linux":
self.mounts.append("/dev/pts")
self.mounts.append("/dev/shm")
@@ -904,7 +904,7 @@ class generic_stage_target(generic_target):
os.makedirs(self.settings["chroot_path"]+x,0755)
if not os.path.exists(self.mountmap[x]):
- if not self.mountmap[x] == "tmpfs":
+ if self.mountmap[x] != "tmpfs" and self.mountmap[x] != "shmfs":
os.makedirs(self.mountmap[x],0755)
src=self.mountmap[x]
@@ -923,6 +923,9 @@ class generic_stage_target(generic_target):
retval=os.system("mount -t tmpfs -o size="+\
self.settings["var_tmpfs_portage"]+"G "+src+" "+\
self.settings["chroot_path"]+x)
+ elif src == "shmfs":
+ retval=os.system("mount -t tmpfs -o noexec,nosuid,nodev shm "+\
+ self.settings["chroot_path"]+x)
else:
retval=os.system("mount --bind "+src+" "+\
self.settings["chroot_path"]+x)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-01-01 21:40 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-01-01 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 11735664906bc4a3c9a5cc155414958adecda1d4
Author: Douglas Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Wed Jan 1 21:18:22 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jan 1 21:38:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=11735664
Mount /dev/shm in the chroot with the right options
Bind mounting /dev/shm into the chroot isn't a good idea, as there may
be collisions and result in weird side effects. Instead, we can just
mount a new tmpfs there, with the right options to ensure security.
---
modules/generic_stage_target.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 9edafe9..10b367d 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -179,13 +179,13 @@ class generic_stage_target(generic_target):
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
- "/dev/shm": "/dev/shm"}
+ "/dev/shm": "shmfs"}
else:
self.mounts=["/proc", "/dev", "/usr/portage/distfiles",
"/var/tmp/portage"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
- "/dev/shm": "/dev/shm"}
+ "/dev/shm": "shmfs"}
if os.uname()[0] == "Linux":
self.mounts.append("/dev/pts")
self.mounts.append("/dev/shm")
@@ -904,7 +904,7 @@ class generic_stage_target(generic_target):
os.makedirs(self.settings["chroot_path"]+x,0755)
if not os.path.exists(self.mountmap[x]):
- if not self.mountmap[x] == "tmpfs":
+ if self.mountmap[x] != "tmpfs" and self.mountmap[x] != "shmfs":
os.makedirs(self.mountmap[x],0755)
src=self.mountmap[x]
@@ -923,6 +923,9 @@ class generic_stage_target(generic_target):
retval=os.system("mount -t tmpfs -o size="+\
self.settings["var_tmpfs_portage"]+"G "+src+" "+\
self.settings["chroot_path"]+x)
+ else if src == "shmfs":
+ retval=os.system("mount -t tmpfs -o noexec,nosuid,nodev shm "+\
+ self.settings["chroot_path"]+x)
else:
retval=os.system("mount --bind "+src+" "+\
self.settings["chroot_path"]+x)
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2014-01-01 14:47 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2014-01-01 14:47 UTC (permalink / raw
To: gentoo-commits
commit: ee9f7930ef93c905cc116834a66295af1bc0569e
Author: W. Trevor King <wking <AT> tremily <DOT> us>
AuthorDate: Fri Dec 27 02:40:10 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Jan 1 14:41:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=ee9f7930
modules/generic_target.py: Pass TERM through to the chroot environment
Avoid:
Running stage1-chroot.sh in chroot /var/tmp/catalyst/tmp/default/...
tput: No value for $TERM and no -T specified
by passing the caller's TERM environment variable [1] through to the
chroot. If the caller does not supply TERM, default to 'dumb' which
disables color etc., but should be the most portable. On Gentoo, the
dumb terminfo (/usr/share/terminfo/d/dumb) is distributed as part of
ncurses [2]. You can list supported terminals with toe, which is also
distributed with ncurses [2]:
$ toe
ansi ansi/pc-term compatible with color
dumb 80-column dumb tty
linux linux console
...
[1]: http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap08.html#tag_08_03
[2]: http://www.gnu.org/software/ncurses/
---
modules/generic_target.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/modules/generic_target.py b/modules/generic_target.py
index fe96bd7..30dadc8 100644
--- a/modules/generic_target.py
+++ b/modules/generic_target.py
@@ -1,3 +1,5 @@
+import os
+
from catalyst_support import *
class generic_target:
@@ -7,5 +9,7 @@ class generic_target:
def __init__(self,myspec,addlargs):
addl_arg_parse(myspec,addlargs,self.required_values,self.valid_values)
self.settings=myspec
- self.env={}
- self.env["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
+ self.env = {
+ 'PATH': '/bin:/sbin:/usr/bin:/usr/sbin',
+ 'TERM': os.getenv('TERM', 'dumb'),
+ }
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2013-12-31 23:27 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2013-12-31 23:27 UTC (permalink / raw
To: gentoo-commits
commit: 648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 20:14:36 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 23:25:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=648c9cc9
Backport a937ae8 /dev/shm mount fix to the 2.X branch.
Original patch:
Author: Anthony G. Basile <blueness <AT> gentoo.org> (Tue 31 Dec 2013 10:55:19 AM PST)
catalyst/targets/generic_stage_target.py: mount /dev/shm on linux
Some build systems require /dev/shm to be mounted, like python's
build system. We make sure that on Linux systems, /dev/shm is
mounted in the stage chroots. See bug #496328.
---
modules/generic_stage_target.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 848aca2..9edafe9 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -174,16 +174,21 @@ class generic_stage_target(generic_target):
""" Setup our mount points """
if "SNAPCACHE" in self.settings:
- self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"]
+ self.mounts=["/proc", "/dev", "/usr/portage",
+ "/usr/portage/distfiles", "/var/tmp/portage"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+ "/dev/shm": "/dev/shm"}
else:
- self.mounts=["/proc","/dev","/usr/portage/distfiles","/var/tmp/portage"]
+ self.mounts=["/proc", "/dev", "/usr/portage/distfiles",
+ "/var/tmp/portage"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+ "/dev/shm": "/dev/shm"}
if os.uname()[0] == "Linux":
self.mounts.append("/dev/pts")
+ self.mounts.append("/dev/shm")
self.set_mounts()
^ permalink raw reply related [flat|nested] 13+ messages in thread* [gentoo-commits] proj/catalyst:2.X commit in: modules/
@ 2013-12-31 20:15 Brian Dolbec
0 siblings, 0 replies; 13+ messages in thread
From: Brian Dolbec @ 2013-12-31 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 128037062d45f83862392d78a96af55c4f93ce28
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 31 20:14:36 2013 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Tue Dec 31 20:14:36 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=12803706
Backort a937ae8 /dev/shm mount fix to the 2.X branch.
Original patch:
Author: Anthony G. Basile <blueness <AT> gentoo.org> (Tue 31 Dec 2013 10:55:19 AM PST)
catalyst/targets/generic_stage_target.py: mount /dev/shm on linux
Some build systems require /dev/shm to be mounted, like python's
build system. We make sure that on Linux systems, /dev/shm is
mounted in the stage chroots. See bug #496328.
---
modules/generic_stage_target.py | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 848aca2..fb5cd2c 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -174,16 +174,21 @@ class generic_stage_target(generic_target):
""" Setup our mount points """
if "SNAPCACHE" in self.settings:
- self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"]
+ self.mounts=["/proc", "/dev", "/usr/portage",
+ "/usr/portage/distfiles", "/var/tmp/portage", "/dev/shm"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+ "/dev/shm": "/dev/shm"}
else:
- self.mounts=["/proc","/dev","/usr/portage/distfiles","/var/tmp/portage"]
+ self.mounts=["/proc", "/dev", "/usr/portage/distfiles",
+ "/var/tmp/portage", "/dev/shm"]
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"}
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs",
+ "/dev/shm": "/dev/shm"}
if os.uname()[0] == "Linux":
self.mounts.append("/dev/pts")
+ self.mounts.append("/dev/shm")
self.set_mounts()
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2015-01-19 3:19 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-24 16:08 [gentoo-commits] proj/catalyst:2.X commit in: modules/ Brian Dolbec
-- strict thread matches above, loose matches on Subject: below --
2015-01-19 3:19 Anthony G. Basile
2014-12-19 1:23 Jorge Manuel B. S. Vicetto
2014-12-06 17:37 Jorge Manuel B. S. Vicetto
2014-12-06 16:56 Jorge Manuel B. S. Vicetto
2014-05-16 19:15 Brian Dolbec
2014-04-05 7:36 Brian Dolbec
2014-03-24 16:08 Brian Dolbec
2014-01-01 22:03 Brian Dolbec
2014-01-01 21:40 Brian Dolbec
2014-01-01 14:47 Brian Dolbec
2013-12-31 23:27 Brian Dolbec
2013-12-31 20:15 Brian Dolbec
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox