From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QdTGc-0004x9-Hi for garchives@archives.gentoo.org; Sun, 03 Jul 2011 20:27:48 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6316021C06A; Sun, 3 Jul 2011 20:27:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 33E0A21C06A for ; Sun, 3 Jul 2011 20:27:39 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C39B31B4003 for ; Sun, 3 Jul 2011 20:27:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 1F1A98003D for ; Sun, 3 Jul 2011 20:27:38 +0000 (UTC) From: "Alexey Shvetsov" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexey Shvetsov" Message-ID: <0345b7745b75bb80608bd5dc7e8694affca8a75a.alexxy@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/slurm/ X-VCS-Repository: proj/sci X-VCS-Files: sys-cluster/slurm/slurm-2.2.7.ebuild X-VCS-Directories: sys-cluster/slurm/ X-VCS-Committer: alexxy X-VCS-Committer-Name: Alexey Shvetsov X-VCS-Revision: 0345b7745b75bb80608bd5dc7e8694affca8a75a Date: Sun, 3 Jul 2011 20:27:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 4aec76eac7ea28fd696227227f68b633 commit: 0345b7745b75bb80608bd5dc7e8694affca8a75a Author: Alexey Shvetsov gentoo org> AuthorDate: Sun Jul 3 20:26:51 2011 +0000 Commit: Alexey Shvetsov gentoo org> CommitDate: Sun Jul 3 20:26:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D0345b774 Fix cgroup location (Portage version: 2.2.0_alpha43/git/Linux x86_64, signed Manifest commit = with key F82F92E6) --- sys-cluster/slurm/slurm-2.2.7.ebuild | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/sys-cluster/slurm/slurm-2.2.7.ebuild b/sys-cluster/slurm/slu= rm-2.2.7.ebuild index 21a3aeb..4bc31bd 100644 --- a/sys-cluster/slurm/slurm-2.2.7.ebuild +++ b/sys-cluster/slurm/slurm-2.2.7.ebuild @@ -31,6 +31,16 @@ pkg_setup() { enewuser slurm -1 -1 /var/spool/slurm slurm } =20 +src_prepare() { + # gentoo uses /sys/fs/cgroup instead of /dev/cgroup + sed -e 's:/dev/cgroup:/sys/fs/cgroup:g' \ + -i "${S}/doc/man/man5/cgroup.conf.5" \ + -i "${S}/etc/cgroup.conf.example" \ + -i "${S}/etc/cgroup.release_agent" \ + -i "${S}/src/plugins/proctrack/cgroup/xcgroup.h" \ + || die +} + src_configure() { local myconf=3D( --sysconfdir=3D"${EPREFIX}/etc/${PN}"