diff options
author | Maxim Koltsov <maksbotan@gentoo.org> | 2013-07-21 08:19:29 +0000 |
---|---|---|
committer | Maxim Koltsov <maksbotan@gentoo.org> | 2013-07-21 08:19:29 +0000 |
commit | 41574619cdbb42e6853583d44d078491cba231c0 (patch) | |
tree | f8f80eff61f15b8845604515325e384723f44877 /sys-cluster | |
parent | Mask packages for removal (diff) | |
download | gentoo-2-41574619cdbb42e6853583d44d078491cba231c0.tar.gz gentoo-2-41574619cdbb42e6853583d44d078491cba231c0.tar.bz2 gentoo-2-41574619cdbb42e6853583d44d078491cba231c0.zip |
Bump to 4.4, update ploop dep version in 9999. Thanks to slepnoga.
(Portage version: 2.1.12.13/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE)
Diffstat (limited to 'sys-cluster')
-rw-r--r-- | sys-cluster/vzctl/ChangeLog | 8 | ||||
-rw-r--r-- | sys-cluster/vzctl/vzctl-4.4.ebuild | 87 | ||||
-rw-r--r-- | sys-cluster/vzctl/vzctl-9999.ebuild | 4 |
3 files changed, 96 insertions, 3 deletions
diff --git a/sys-cluster/vzctl/ChangeLog b/sys-cluster/vzctl/ChangeLog index 1f86c8ac0329..204164f18969 100644 --- a/sys-cluster/vzctl/ChangeLog +++ b/sys-cluster/vzctl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-cluster/vzctl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.113 2013/06/10 10:01:42 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.114 2013/07/21 08:19:29 maksbotan Exp $ + +*vzctl-4.4 (21 Jul 2013) + + 21 Jul 2013; Maxim Koltsov <maksbotan@gentoo.org> +vzctl-4.4.ebuild, + vzctl-9999.ebuild: + Bump to 4.4, update ploop dep version in 9999. Thanks to slepnoga. *vzctl-4.3.1 (10 Jun 2013) diff --git a/sys-cluster/vzctl/vzctl-4.4.ebuild b/sys-cluster/vzctl/vzctl-4.4.ebuild new file mode 100644 index 000000000000..9dcd7d251a44 --- /dev/null +++ b/sys-cluster/vzctl/vzctl-4.4.ebuild @@ -0,0 +1,87 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.4.ebuild,v 1.1 2013/07/21 08:19:29 maksbotan Exp $ + +EAPI="5" + +inherit base bash-completion-r1 eutils toolchain-funcs udev + +DESCRIPTION="OpenVZ ConTainers control utility" +HOMEPAGE="http://openvz.org/" +SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ploop vanilla-kernel vz-kernel" + +RDEPEND="net-firewall/iptables + sys-apps/ed + >=sys-apps/iproute2-3.3.0 + vz-kernel? ( sys-fs/vzquota ) + ploop? ( >=sys-cluster/ploop-1.8 ) + vanilla-kernel? ( >=dev-libs/libcgroup-0.37 ) + " + +DEPEND="${RDEPEND} + virtual/pkgconfig + " + +PDEPEND=" + app-misc/vzstats +" + +REQUIRED_USE="^^ ( vz-kernel vanilla-kernel )" + +src_prepare() { + + # Set default OSTEMPLATE on gentoo + sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' + # Set proper udev directory + sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' +} + +src_configure() { + + econf \ + --localstatedir=/var \ + --enable-udev \ + --enable-bashcomp \ + --enable-logrotate \ + --with-vz \ + $(use_with ploop) \ + $(use_with vanilla-kernel cgroup) +} + +src_install() { + + emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo + + # install the bash-completion script into the right location + rm -rf "${ED}"/etc/bash_completion.d + newbashcomp etc/bash_completion.d/vzctl.sh ${PN} + + # We need to keep some dirs + keepdir /vz/{dump,lock,root,private,template/cache} + keepdir /etc/vz/names /var/lib/vzctl/veip +} + +pkg_postinst() { + ewarn "To avoid loosing network to CTs on iface down/up, please, add the" + ewarn "following code to /etc/conf.d/net:" + ewarn " postup() {" + ewarn " /usr/sbin/vzifup-post \${IFACE}" + ewarn " }" + + ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs." + ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and" + ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use" + ewarn "/etc/init.d/vzeventd." + + if use vanilla-kernel; then + einfo "You have selected vanilla' kernel support." + einfo "If you need checkpoint suspend/restore feature" + einfo "please install 'sys-process/criu' " + einfo "This is experimental and not stable (in gentoo) now" + fi +} diff --git a/sys-cluster/vzctl/vzctl-9999.ebuild b/sys-cluster/vzctl/vzctl-9999.ebuild index 939aff7364f7..cf12df05fdeb 100644 --- a/sys-cluster/vzctl/vzctl-9999.ebuild +++ b/sys-cluster/vzctl/vzctl-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.15 2013/05/31 15:20:52 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.16 2013/07/21 08:19:29 maksbotan Exp $ EAPI="5" @@ -23,7 +23,7 @@ RDEPEND="net-firewall/iptables sys-apps/ed >=sys-apps/iproute2-3.3.0 vz-kernel? ( sys-fs/vzquota ) - ploop? ( >=sys-cluster/ploop-1.6 ) + ploop? ( >=sys-cluster/ploop-1.8 ) vanilla-kernel? ( >=dev-libs/libcgroup-0.37 ) " |