summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenedikt Boehm <hollow@gentoo.org>2010-08-19 18:22:51 +0000
committerBenedikt Boehm <hollow@gentoo.org>2010-08-19 18:22:51 +0000
commitcfe2db5f391e9ca778cdb70c4a58f3536b6770bd (patch)
treea80bf0bed8a60d2668a27b04c7ffb13de7bea245 /sys-cluster
parentFix building with recent glibc wrt #333373 by Michael Weber. (diff)
downloadgentoo-2-cfe2db5f391e9ca778cdb70c4a58f3536b6770bd.tar.gz
gentoo-2-cfe2db5f391e9ca778cdb70c4a58f3536b6770bd.tar.bz2
gentoo-2-cfe2db5f391e9ca778cdb70c4a58f3536b6770bd.zip
add new snapshot for 2.6.35 kernel support (you need memory control groups enabled)
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/util-vserver/ChangeLog10
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.215.ebuild134
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild (renamed from sys-cluster/util-vserver/util-vserver-0.30.216_pre2864.ebuild)8
3 files changed, 10 insertions, 142 deletions
diff --git a/sys-cluster/util-vserver/ChangeLog b/sys-cluster/util-vserver/ChangeLog
index 5b8fa21c627d..1f00347aff62 100644
--- a/sys-cluster/util-vserver/ChangeLog
+++ b/sys-cluster/util-vserver/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for sys-cluster/util-vserver
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.102 2010/04/08 09:55:22 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/ChangeLog,v 1.103 2010/08/19 18:22:51 hollow Exp $
+
+*util-vserver-0.30.216_pre2910 (19 Aug 2010)
+
+ 19 Aug 2010; Benedikt Böhm <hollow@gentoo.org>
+ -util-vserver-0.30.215.ebuild, -util-vserver-0.30.216_pre2864.ebuild,
+ +util-vserver-0.30.216_pre2910.ebuild:
+ add new snapshot for 2.6.35 kernel support (you need memory control groups
+ enabled)
*util-vserver-0.30.216_pre2883 (08 Apr 2010)
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
deleted file mode 100644
index 62a59cb19a5b..000000000000
--- a/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.215.ebuild,v 1.5 2008/08/08 08:40:14 hollow Exp $
-
-inherit eutils bash-completion
-
-DESCRIPTION="Linux-VServer admin utilities"
-HOMEPAGE="http://www.nongnu.org/util-vserver/"
-SRC_URI="http://ftp.linux-vserver.org/pub/utils/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ppc ~sparc x86"
-
-IUSE=""
-
-CDEPEND="dev-libs/beecrypt
- net-firewall/iptables
- net-misc/vconfig
- sys-apps/iproute2
- || ( >=sys-apps/coreutils-6.10-r1 sys-apps/mktemp )"
-
-DEPEND=">=dev-libs/dietlibc-0.30-r2
- ${CDEPEND}"
-
-RDEPEND="${CDEPEND}"
-
-pkg_setup() {
- if [[ -z "${VDIRBASE}" ]]; then
- einfo
- einfo "You can change the default vserver base directory (/vservers)"
- einfo "by setting the VDIRBASE environment variable."
- fi
-
- : ${VDIRBASE:=/vservers}
-
- einfo
- einfo "Using \"${VDIRBASE}\" as vserver base directory"
- einfo
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${P}-openrc.patch
-}
-
-src_compile() {
- econf --with-vrootdir=${VDIRBASE} \
- --with-initscripts=gentoo \
- --localstatedir=/var || die "econf failed!"
- emake || die "emake failed!"
-}
-
-src_install() {
- make DESTDIR="${D}" install install-distribution \
- || die "make install failed!"
-
- # keep dirs
- keepdir /var/run/vservers
- keepdir /var/run/vservers.rev
- keepdir /var/run/vshelper
- keepdir /var/lock/vservers
- keepdir /var/cache/vservers
- keepdir "${VDIRBASE}"
- keepdir "${VDIRBASE}"/.pkg
-
- # remove legacy config file
- rm -f "${D}"/etc/vservers.conf
-
- # bash-completion
- dobashcompletion "${FILESDIR}"/bash_completion util-vserver
-
- dodoc README ChangeLog NEWS AUTHORS THANKS util-vserver.spec
-}
-
-pkg_preinst() {
- has_version "<${CATEGORY}/${PN}-0.30.211"
- old_init_script_warn=$?
-}
-
-pkg_postinst() {
- # Create VDIRBASE in postinst, so it is (a) not unmerged and (b) also
- # present when merging.
-
- [ ! -d "${VDIRBASE}" ] && mkdir -p "${VDIRBASE}" &> /dev/null
- setattr --barrier "${VDIRBASE}" &> /dev/null
-
- rm /etc/vservers/.defaults/vdirbase
- ln -sf "${VDIRBASE}" /etc/vservers/.defaults/vdirbase
-
- elog
- elog "You have to run the vprocunhide command after every reboot"
- elog "in order to setup /proc permissions correctly for vserver"
- elog "use. An init script has been installed by this package."
- elog "To use it you should add it to a runlevel:"
- elog
- elog " rc-update add vprocunhide default"
- elog
-
- if [[ $old_init_script_warn = 0 ]] ; then
- ewarn "Please make sure, that you remove the old init-script from any"
- ewarn "runlevel and remove it from your init.d dir!"
- ewarn
- ewarn "# rc-update del vservers"
- ewarn "# rm -f ${ROOT}etc/init.d/vservers"
- ewarn
- ewarn "Since util-vserver-0.30.211 all Gentoo specific wrappers"
- ewarn "have been merged upstream, and may now have a slightly"
- ewarn "different syntax, i.e. you have to update scripts that"
- ewarn "depend on these wrappers (vesync, vemerge, vupdateworld"
- ewarn "and vdispatch-conf)"
- ewarn
- ewarn "Additionally the init scripts have changed and now use"
- ewarn "upstream scripts as backend. An init script to start"
- ewarn "virtual servers in the 'default' group/mark has been"
- ewarn "installed by this ebuild:"
- ewarn
- ewarn " rc-update add vservers.default default"
- ewarn
- ewarn "To start vservers in other groups/marks, you have to"
- ewarn "symlink the default init script the same way you do"
- ewarn "with net.* scripts:"
- ewarn
- ewarn " ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
- ewarn
- fi
-
- ewarn "You should definitly fix up the barrier of your vserver"
- ewarn "base directory by using the following command in a root shell:"
- ewarn
- ewarn " setattr --barrier ${VDIRBASE}"
- ewarn
-}
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2864.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
index 4e4a10c14d83..eea24e15ad41 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre2864.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre2864.ebuild,v 1.1 2010/01/17 10:07:42 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/util-vserver/util-vserver-0.30.216_pre2910.ebuild,v 1.1 2010/08/19 18:22:51 hollow Exp $
inherit eutils bash-completion
@@ -122,10 +122,4 @@ pkg_postinst() {
ewarn " ln -s /etc/init.d/vservers.default /etc/init.d/vservers.<mark>"
ewarn
fi
-
- ewarn "You should definitly fix up the barrier of your vserver"
- ewarn "base directory by using the following command in a root shell:"
- ewarn
- ewarn " setattr --barrier ${VDIRBASE}"
- ewarn
}