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 A8AD2138247 for ; Tue, 31 Dec 2013 23:27:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9988DE0A94; Tue, 31 Dec 2013 23:27:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 21220E0A94 for ; Tue, 31 Dec 2013 23:27:24 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5E2E33F6B6 for ; Tue, 31 Dec 2013 23:27:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 47F1AE545E for ; Tue, 31 Dec 2013 23:27:21 +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: <1388532334.648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:2.X commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/generic_stage_target.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5 X-VCS-Branch: 2.X Date: Tue, 31 Dec 2013 23:27:21 +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: c2a7d0ae-c42c-48a9-84b9-db3c950edae1 X-Archives-Hash: b32be8aa42cff7c0871a557186fc4ab8 commit: 648c9cc9bfdf88e3612399f2cc9bed9a3bae17f5 Author: Brian Dolbec gentoo org> AuthorDate: Tue Dec 31 20:14:36 2013 +0000 Commit: Brian Dolbec gmail 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 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()