1 |
maksbotan 13/05/31 15:20:52 |
2 |
|
3 |
Modified: vzctl-9999.ebuild metadata.xml ChangeLog |
4 |
Added: vzctl-4.3.ebuild |
5 |
Log: |
6 |
Bump to 4.3 and update 9999, adding vanilla kernel support. Thanks to slepnoga. |
7 |
|
8 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key F8DBDADE) |
9 |
|
10 |
Revision Changes Path |
11 |
1.15 sys-cluster/vzctl/vzctl-9999.ebuild |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?rev=1.15&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?rev=1.15&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild?r1=1.14&r2=1.15 |
16 |
|
17 |
Index: vzctl-9999.ebuild |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v |
20 |
retrieving revision 1.14 |
21 |
retrieving revision 1.15 |
22 |
diff -u -r1.14 -r1.15 |
23 |
--- vzctl-9999.ebuild 22 Feb 2013 14:24:39 -0000 1.14 |
24 |
+++ vzctl-9999.ebuild 31 May 2013 15:20:52 -0000 1.15 |
25 |
@@ -1,10 +1,13 @@ |
26 |
# Copyright 1999-2013 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.14 2013/02/22 14:24:39 pinkbyte Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-9999.ebuild,v 1.15 2013/05/31 15:20:52 maksbotan Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
-inherit bash-completion-r1 autotools git-2 toolchain-funcs udev |
34 |
+AUTOTOOLS_AUTORECONF=1 |
35 |
+AUTOTOOLS_IN_SOURCE_BUILD=1 |
36 |
+ |
37 |
+inherit bash-completion-r1 autotools-utils git-2 toolchain-funcs udev |
38 |
|
39 |
DESCRIPTION="OpenVZ ConTainers control utility" |
40 |
HOMEPAGE="http://openvz.org/" |
41 |
@@ -14,39 +17,49 @@ |
42 |
LICENSE="GPL-2" |
43 |
SLOT="0" |
44 |
KEYWORDS="" |
45 |
-IUSE="cgroup +ploop" |
46 |
+IUSE="ploop vanilla-kernel vz-kernel" |
47 |
|
48 |
-RDEPEND=" |
49 |
- net-firewall/iptables |
50 |
- sys-apps/ed |
51 |
- >=sys-apps/iproute2-3.3.0 |
52 |
- sys-fs/vzquota |
53 |
- ploop? ( >=sys-cluster/ploop-1.5 ) |
54 |
- cgroup? ( >=dev-libs/libcgroup-0.37 ) |
55 |
-" |
56 |
+RDEPEND="net-firewall/iptables |
57 |
+ sys-apps/ed |
58 |
+ >=sys-apps/iproute2-3.3.0 |
59 |
+ vz-kernel? ( sys-fs/vzquota ) |
60 |
+ ploop? ( >=sys-cluster/ploop-1.6 ) |
61 |
+ vanilla-kernel? ( >=dev-libs/libcgroup-0.37 ) |
62 |
+ " |
63 |
|
64 |
DEPEND="${RDEPEND} |
65 |
virtual/pkgconfig" |
66 |
|
67 |
+REQUIRED_USE="^^ ( vz-kernel vanilla-kernel )" |
68 |
+ |
69 |
src_prepare() { |
70 |
+ |
71 |
# Set default OSTEMPLATE on gentoo |
72 |
sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' |
73 |
# Set proper udev directory |
74 |
sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' |
75 |
- eautoreconf |
76 |
+ |
77 |
+ #provide user_epatch |
78 |
+ autotools-utils_src_prepare |
79 |
} |
80 |
|
81 |
src_configure() { |
82 |
- econf \ |
83 |
- --localstatedir=/var \ |
84 |
- --enable-udev \ |
85 |
- --enable-bashcomp \ |
86 |
- --enable-logrotate \ |
87 |
- $(use_with ploop) \ |
88 |
- $(use_with cgroup) |
89 |
+ |
90 |
+ local myeconfargs=( |
91 |
+ --localstatedir=/var |
92 |
+ --enable-udev |
93 |
+ --enable-bashcomp |
94 |
+ --enable-logrotate |
95 |
+ --with-vz |
96 |
+ $(use_with ploop) |
97 |
+ $(use_with vanilla-kernel cgroup) |
98 |
+ ) |
99 |
+ |
100 |
+ autotools-utils_src_configure |
101 |
} |
102 |
|
103 |
src_install() { |
104 |
+ |
105 |
emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo |
106 |
|
107 |
# install the bash-completion script into the right location |
108 |
@@ -59,6 +72,7 @@ |
109 |
} |
110 |
|
111 |
pkg_postinst() { |
112 |
+ |
113 |
ewarn "To avoid loosing network to CTs on iface down/up, please, add the" |
114 |
ewarn "following code to /etc/conf.d/net:" |
115 |
ewarn " postup() {" |
116 |
@@ -70,9 +84,10 @@ |
117 |
ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use" |
118 |
ewarn "/etc/init.d/vzeventd." |
119 |
|
120 |
- if use cgroup; then |
121 |
- ewarn "You have chose to use experimental CGROUP feature" |
122 |
- ewarn "please do NOT file bugs to Gentoo bugzilla," |
123 |
- ewarn "use upstream bug tracker instead" |
124 |
+ if use vanilla-kernel; then |
125 |
+ einfo "You have selected vanilla' kernel support." |
126 |
+ einfo "If you need checkpoint suspend/restore feature" |
127 |
+ einfo "please install 'sys-process/criu' " |
128 |
+ einfo "This is experimental and not stable (in gentoo) now" |
129 |
fi |
130 |
} |
131 |
|
132 |
|
133 |
|
134 |
1.11 sys-cluster/vzctl/metadata.xml |
135 |
|
136 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/metadata.xml?rev=1.11&view=markup |
137 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/metadata.xml?rev=1.11&content-type=text/plain |
138 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/metadata.xml?r1=1.10&r2=1.11 |
139 |
|
140 |
Index: metadata.xml |
141 |
=================================================================== |
142 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/metadata.xml,v |
143 |
retrieving revision 1.10 |
144 |
retrieving revision 1.11 |
145 |
diff -u -r1.10 -r1.11 |
146 |
--- metadata.xml 16 Feb 2013 13:02:11 -0000 1.10 |
147 |
+++ metadata.xml 31 May 2013 15:20:52 -0000 1.11 |
148 |
@@ -11,6 +11,8 @@ |
149 |
<use> |
150 |
<flag name='ploop'>Add support for ploop devices via <pkg>sys-cluster/ploop</pkg></flag> |
151 |
<flag name='cgroup'>Add support to Linux kernel cgroup subsytem</flag> |
152 |
+ <flag name='vz-kernel'>Support OpenVZ patched kernel (<pkg>sys-kernel/openvz-sources</pkg>)</flag> |
153 |
+ <flag name='vanilla-kernel'>Support unpatched upstream Linux kernel</flag> |
154 |
</use> |
155 |
<upstream> |
156 |
<maintainer status="active"> |
157 |
|
158 |
|
159 |
|
160 |
1.112 sys-cluster/vzctl/ChangeLog |
161 |
|
162 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.112&view=markup |
163 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?rev=1.112&content-type=text/plain |
164 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/ChangeLog?r1=1.111&r2=1.112 |
165 |
|
166 |
Index: ChangeLog |
167 |
=================================================================== |
168 |
RCS file: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v |
169 |
retrieving revision 1.111 |
170 |
retrieving revision 1.112 |
171 |
diff -u -r1.111 -r1.112 |
172 |
--- ChangeLog 25 May 2013 08:51:28 -0000 1.111 |
173 |
+++ ChangeLog 31 May 2013 15:20:52 -0000 1.112 |
174 |
@@ -1,6 +1,13 @@ |
175 |
# ChangeLog for sys-cluster/vzctl |
176 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
177 |
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.111 2013/05/25 08:51:28 ago Exp $ |
178 |
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/ChangeLog,v 1.112 2013/05/31 15:20:52 maksbotan Exp $ |
179 |
+ |
180 |
+*vzctl-4.3 (31 May 2013) |
181 |
+ |
182 |
+ 31 May 2013; Maxim Koltsov <maksbotan@g.o> +vzctl-4.3.ebuild, |
183 |
+ metadata.xml, vzctl-9999.ebuild: |
184 |
+ Bump to 4.3 and update 9999, adding vanilla kernel support. Thanks to |
185 |
+ slepnoga. |
186 |
|
187 |
25 May 2013; Agostino Sarubbo <ago@g.o> vzctl-4.2.ebuild: |
188 |
Add ~ppc64, wrt bug #414531 |
189 |
|
190 |
|
191 |
|
192 |
1.1 sys-cluster/vzctl/vzctl-4.3.ebuild |
193 |
|
194 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-4.3.ebuild?rev=1.1&view=markup |
195 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/vzctl/vzctl-4.3.ebuild?rev=1.1&content-type=text/plain |
196 |
|
197 |
Index: vzctl-4.3.ebuild |
198 |
=================================================================== |
199 |
# Copyright 1999-2013 Gentoo Foundation |
200 |
# Distributed under the terms of the GNU General Public License v2 |
201 |
# $Header: /var/cvsroot/gentoo-x86/sys-cluster/vzctl/vzctl-4.3.ebuild,v 1.1 2013/05/31 15:20:52 maksbotan Exp $ |
202 |
|
203 |
EAPI="5" |
204 |
|
205 |
inherit base bash-completion-r1 eutils toolchain-funcs udev |
206 |
|
207 |
DESCRIPTION="OpenVZ ConTainers control utility" |
208 |
HOMEPAGE="http://openvz.org/" |
209 |
SRC_URI="http://download.openvz.org/utils/${PN}/${PV}/src/${P}.tar.bz2" |
210 |
|
211 |
LICENSE="GPL-2" |
212 |
SLOT="0" |
213 |
KEYWORDS="~amd64 ~x86 ~ppc64" |
214 |
IUSE="ploop vanilla-kernel vz-kernel" |
215 |
|
216 |
RDEPEND="net-firewall/iptables |
217 |
sys-apps/ed |
218 |
>=sys-apps/iproute2-3.3.0 |
219 |
vz-kernel? ( sys-fs/vzquota ) |
220 |
ploop? ( >=sys-cluster/ploop-1.5 ) |
221 |
vanilla-kernel? ( >=dev-libs/libcgroup-0.37 ) |
222 |
" |
223 |
|
224 |
DEPEND="${RDEPEND} |
225 |
virtual/pkgconfig |
226 |
" |
227 |
|
228 |
REQUIRED_USE="^^ ( vz-kernel vanilla-kernel )" |
229 |
|
230 |
src_prepare() { |
231 |
|
232 |
# Set default OSTEMPLATE on gentoo |
233 |
sed -i -e 's:=redhat-:=gentoo-:' etc/dists/default || die 'sed on etc/dists/default failed' |
234 |
# Set proper udev directory |
235 |
sed -i -e "s:/lib/udev:$(udev_get_udevdir):" src/lib/dev.c || die 'sed on src/lib/dev.c failed' |
236 |
} |
237 |
|
238 |
src_configure() { |
239 |
|
240 |
econf \ |
241 |
--localstatedir=/var \ |
242 |
--enable-udev \ |
243 |
--enable-bashcomp \ |
244 |
--enable-logrotate \ |
245 |
--with-vz \ |
246 |
$(use_with ploop) \ |
247 |
$(use_with vanilla-kernel cgroup) |
248 |
} |
249 |
|
250 |
src_install() { |
251 |
|
252 |
emake DESTDIR="${D}" udevdir="$(udev_get_udevdir)"/rules.d install install-gentoo |
253 |
|
254 |
# install the bash-completion script into the right location |
255 |
rm -rf "${ED}"/etc/bash_completion.d |
256 |
newbashcomp etc/bash_completion.d/vzctl.sh ${PN} |
257 |
|
258 |
# We need to keep some dirs |
259 |
keepdir /vz/{dump,lock,root,private,template/cache} |
260 |
keepdir /etc/vz/names /var/lib/vzctl/veip |
261 |
} |
262 |
|
263 |
pkg_postinst() { |
264 |
ewarn "To avoid loosing network to CTs on iface down/up, please, add the" |
265 |
ewarn "following code to /etc/conf.d/net:" |
266 |
ewarn " postup() {" |
267 |
ewarn " /usr/sbin/vzifup-post \${IFACE}" |
268 |
ewarn " }" |
269 |
|
270 |
ewarn "Starting with 3.0.25 there is new vzeventd service to reboot CTs." |
271 |
ewarn "Please, drop /usr/share/vzctl/scripts/vpsnetclean and" |
272 |
ewarn "/usr/share/vzctl/scripts/vpsreboot from crontab and use" |
273 |
ewarn "/etc/init.d/vzeventd." |
274 |
|
275 |
if use vanilla-kernel; then |
276 |
einfo "You have selected vanilla' kernel support." |
277 |
einfo "If you need checkpoint suspend/restore feature" |
278 |
einfo "please install 'sys-process/criu' " |
279 |
einfo "This is experimental and not stable (in gentoo) now" |
280 |
fi |
281 |
} |