| 1 |
commit: 648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5 |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 31 20:14:36 2013 +0000 |
| 4 |
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com> |
| 5 |
CommitDate: Tue Dec 31 23:25:34 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=648c9cc9 |
| 7 |
|
| 8 |
Backport a937ae8 /dev/shm mount fix to the 2.X branch. |
| 9 |
|
| 10 |
Original patch: |
| 11 |
Author: Anthony G. Basile <blueness <AT> gentoo.org> (Tue 31 Dec 2013 10:55:19 AM PST) |
| 12 |
catalyst/targets/generic_stage_target.py: mount /dev/shm on linux |
| 13 |
|
| 14 |
Some build systems require /dev/shm to be mounted, like python's |
| 15 |
build system. We make sure that on Linux systems, /dev/shm is |
| 16 |
mounted in the stage chroots. See bug #496328. |
| 17 |
|
| 18 |
--- |
| 19 |
modules/generic_stage_target.py | 13 +++++++++---- |
| 20 |
1 file changed, 9 insertions(+), 4 deletions(-) |
| 21 |
|
| 22 |
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py |
| 23 |
index 848aca2..9edafe9 100644 |
| 24 |
--- a/modules/generic_stage_target.py |
| 25 |
+++ b/modules/generic_stage_target.py |
| 26 |
@@ -174,16 +174,21 @@ class generic_stage_target(generic_target): |
| 27 |
|
| 28 |
""" Setup our mount points """ |
| 29 |
if "SNAPCACHE" in self.settings: |
| 30 |
- self.mounts=["/proc","/dev","/usr/portage","/usr/portage/distfiles","/var/tmp/portage"] |
| 31 |
+ self.mounts=["/proc", "/dev", "/usr/portage", |
| 32 |
+ "/usr/portage/distfiles", "/var/tmp/portage"] |
| 33 |
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\ |
| 34 |
"/usr/portage":self.settings["snapshot_cache_path"]+"/portage",\ |
| 35 |
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"} |
| 36 |
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs", |
| 37 |
+ "/dev/shm": "/dev/shm"} |
| 38 |
else: |
| 39 |
- self.mounts=["/proc","/dev","/usr/portage/distfiles","/var/tmp/portage"] |
| 40 |
+ self.mounts=["/proc", "/dev", "/usr/portage/distfiles", |
| 41 |
+ "/var/tmp/portage"] |
| 42 |
self.mountmap={"/proc":"/proc","/dev":"/dev","/dev/pts":"/dev/pts",\ |
| 43 |
- "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs"} |
| 44 |
+ "/usr/portage/distfiles":self.settings["distdir"],"/var/tmp/portage":"tmpfs", |
| 45 |
+ "/dev/shm": "/dev/shm"} |
| 46 |
if os.uname()[0] == "Linux": |
| 47 |
self.mounts.append("/dev/pts") |
| 48 |
+ self.mounts.append("/dev/shm") |
| 49 |
|
| 50 |
self.set_mounts() |
Archives