1 |
cardoe 12/10/30 05:49:45 |
2 |
|
3 |
Modified: libvirt-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Update the live ebuild. |
6 |
|
7 |
(Portage version: 2.1.11.9/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.42 app-emulation/libvirt/libvirt-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.42&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?rev=1.42&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild?r1=1.41&r2=1.42 |
15 |
|
16 |
Index: libvirt-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v |
19 |
retrieving revision 1.41 |
20 |
retrieving revision 1.42 |
21 |
diff -u -r1.41 -r1.42 |
22 |
--- libvirt-9999.ebuild 12 Oct 2012 22:53:59 -0000 1.41 |
23 |
+++ libvirt-9999.ebuild 30 Oct 2012 05:49:45 -0000 1.42 |
24 |
@@ -1,11 +1,11 @@ |
25 |
# Copyright 1999-2012 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.41 2012/10/12 22:53:59 cardoe Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.42 2012/10/30 05:49:45 cardoe Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
|
32 |
-#BACKPORTS=1 |
33 |
-#AUTOTOOLIZE=yes |
34 |
+#BACKPORTS=85e8c146 |
35 |
+AUTOTOOLIZE=yes |
36 |
|
37 |
MY_P="${P/_rc/-rc}" |
38 |
|
39 |
@@ -22,10 +22,10 @@ |
40 |
SRC_URI="" |
41 |
KEYWORDS="" |
42 |
else |
43 |
- SRC_URI="http://libvirt.org/sources/${MY_P}.tar.gz |
44 |
- ftp://libvirt.org/libvirt/${MY_P}.tar.gz |
45 |
+ SRC_URI="http://libvirt.org/sources/stable_updates/${MY_P}.tar.gz |
46 |
+ ftp://libvirt.org/libvirt/stable_updates/${MY_P}.tar.gz |
47 |
${BACKPORTS:+ |
48 |
- http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.bz2}" |
49 |
+ http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}" |
50 |
KEYWORDS="~amd64 ~x86" |
51 |
fi |
52 |
S="${WORKDIR}/${P%_rc*}" |
53 |
@@ -35,8 +35,8 @@ |
54 |
LICENSE="LGPL-2.1" |
55 |
SLOT="0" |
56 |
IUSE="audit avahi +caps debug iscsi +libvirtd lvm +lxc +macvtap nfs \ |
57 |
- nls numa openvz parted pcap phyp policykit python qemu sasl selinux +udev \ |
58 |
- uml +vepa virtualbox virt-network xen elibc_glibc" |
59 |
+ nls numa openvz parted pcap phyp policykit python qemu rbd sasl \ |
60 |
+ selinux +udev uml +vepa virtualbox virt-network xen elibc_glibc" |
61 |
REQUIRED_USE="libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) |
62 |
lxc? ( caps libvirtd ) |
63 |
openvz? ( libvirtd ) |
64 |
@@ -49,13 +49,14 @@ |
65 |
# gettext.sh command is used by the libvirt command wrappers, and it's |
66 |
# non-optional, so put it into RDEPEND. |
67 |
# We can use both libnl:1.1 and libnl:3, but if you have both installed, the |
68 |
-# package will use 1.1 by default |
69 |
+# package will use 3 by default. Since we don't have slot pinning in an API, |
70 |
+# we must go with the most recent |
71 |
RDEPEND="sys-libs/readline |
72 |
sys-libs/ncurses |
73 |
>=net-misc/curl-7.18.0 |
74 |
dev-libs/libgcrypt |
75 |
>=dev-libs/libxml2-2.7.6 |
76 |
- dev-libs/libnl:1.1 |
77 |
+ dev-libs/libnl:3 |
78 |
>=net-libs/gnutls-1.0.25 |
79 |
net-libs/libssh2 |
80 |
sys-apps/dmidecode |
81 |
@@ -82,10 +83,11 @@ |
82 |
pcap? ( >=net-libs/libpcap-1.0.0 ) |
83 |
policykit? ( >=sys-auth/polkit-0.9 ) |
84 |
qemu? ( |
85 |
- || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) |
86 |
+ >=app-emulation/qemu-0.13.0 |
87 |
dev-libs/yajl |
88 |
sys-power/pm-utils |
89 |
) |
90 |
+ rbd? ( sys-cluster/ceph ) |
91 |
sasl? ( dev-libs/cyrus-sasl ) |
92 |
selinux? ( >=sys-libs/libselinux-2.0.85 ) |
93 |
virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) |
94 |
@@ -101,6 +103,7 @@ |
95 |
DEPEND="${RDEPEND} |
96 |
virtual/pkgconfig |
97 |
app-text/xhtml1 |
98 |
+ dev-libs/libxslt |
99 |
=dev-lang/python-2*" |
100 |
|
101 |
LXC_CONFIG_CHECK=" |
102 |
@@ -110,13 +113,11 @@ |
103 |
~CPUSETS |
104 |
~CGROUP_CPUACCT |
105 |
~RESOURCE_COUNTERS |
106 |
- ~CGROUP_MEM_RES_CTLR |
107 |
~CGROUP_SCHED |
108 |
~BLK_CGROUP |
109 |
~NAMESPACES |
110 |
~UTS_NS |
111 |
~IPC_NS |
112 |
- ~USER_NS |
113 |
~PID_NS |
114 |
~NET_NS |
115 |
~DEVPTS_MULTIPLE_INSTANCES |
116 |
@@ -145,6 +146,19 @@ |
117 |
enewgroup qemu 77 |
118 |
enewuser qemu 77 -1 -1 qemu kvm |
119 |
|
120 |
+ # Some people used the masked ebuild which was not adding the qemu |
121 |
+ # user to the kvm group originally. This results in VMs failing to |
122 |
+ # start for some users. bug #430808 |
123 |
+ egetent group kvm | grep -q qemu |
124 |
+ if [[ $? -ne 0 ]]; then |
125 |
+ gpasswd -a qemu kvm |
126 |
+ fi |
127 |
+ |
128 |
+ # Handle specific kernel versions for different features |
129 |
+ kernel_is lt 3 5 && LXC_CONFIG_CHECK+=" ~USER_NS" |
130 |
+ kernel_is lt 3 6 && LXC_CONFIG_CHECK+=" ~CGROUP_MEM_RES_CTLR" || \ |
131 |
+ LXC_CONFIG_CHECK+=" ~MEMCG" |
132 |
+ |
133 |
CONFIG_CHECK="" |
134 |
use lxc && CONFIG_CHECK+="${LXC_CONFIG_CHECK}" |
135 |
use macvtap && CONFIG_CHECK+="${MACVTAP}" |
136 |
@@ -155,6 +169,7 @@ |
137 |
} |
138 |
|
139 |
src_prepare() { |
140 |
+ touch "${S}/.mailmap" |
141 |
[[ -n ${BACKPORTS} ]] && \ |
142 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
143 |
epatch |
144 |
@@ -174,6 +189,19 @@ |
145 |
epatch_user |
146 |
|
147 |
[[ -n ${AUTOTOOLIZE} ]] && eautoreconf |
148 |
+ |
149 |
+ # Tweak the init script |
150 |
+ local avahi_init= |
151 |
+ local iscsi_init= |
152 |
+ local rbd_init= |
153 |
+ cp "${FILESDIR}/libvirtd.init-r10" "${S}/libvirtd.init" |
154 |
+ use avahi && avahi_init='avahi-daemon' |
155 |
+ use iscsi && iscsi_init='iscsid' |
156 |
+ use rbd && rbd_init='ceph' |
157 |
+ |
158 |
+ sed -e "s/USE_FLAG_AVAHI/${avahi_init}/" -i "${S}/libvirtd.init" |
159 |
+ sed -e "s/USE_FLAG_ISCSI/${iscsi_init}/" -i "${S}/libvirtd.init" |
160 |
+ sed -e "s/USE_FLAG_RBD/${rbd_init}/" -i "${S}/libvirtd.init" |
161 |
} |
162 |
|
163 |
src_configure() { |
164 |
@@ -192,7 +220,6 @@ |
165 |
# leave it automagic as it depends on the version of xen used. |
166 |
use xen || myconf+=" --without-libxl" |
167 |
use xen || myconf+=" --without-xenapi" |
168 |
- |
169 |
myconf="${myconf} $(use_with openvz)" |
170 |
myconf="${myconf} $(use_with lxc)" |
171 |
if use virtualbox && has_version app-emulation/virtualbox-ose; then |
172 |
@@ -205,6 +232,7 @@ |
173 |
myconf="${myconf} $(use_with qemu yajl)" # Use QMP over HMP |
174 |
myconf="${myconf} $(use_with phyp)" |
175 |
myconf="${myconf} --with-esx" |
176 |
+ myconf="${myconf} --with-vmware" |
177 |
|
178 |
## additional host drivers |
179 |
myconf="${myconf} $(use_with virt-network network)" |
180 |
@@ -213,7 +241,7 @@ |
181 |
myconf="${myconf} $(use_with iscsi storage-iscsi)" |
182 |
myconf="${myconf} $(use_with parted storage-disk)" |
183 |
myconf="${myconf} $(use_with lvm storage-mpath)" |
184 |
- #myconf="${myconf} --without-storage-rbd" |
185 |
+ myconf="${myconf} $(use_with rbd storage-rbd)" |
186 |
myconf="${myconf} $(use_with numa numactl)" |
187 |
myconf="${myconf} $(use_with numa numad)" |
188 |
myconf="${myconf} $(use_with selinux)" |
189 |
@@ -258,6 +286,9 @@ |
190 |
# locking support |
191 |
myconf="${myconf} --without-sanlock" |
192 |
|
193 |
+ # DBus access to iptables/ebtables and friends |
194 |
+ myconf="${myconf} --without-firewalld" |
195 |
+ |
196 |
# this is a nasty trick to work around the problem in bug |
197 |
# #275073. The reason why we don't solve this properly is that |
198 |
# it'll require us to rebuild autotools (and we don't really want |
199 |
@@ -304,8 +335,8 @@ |
200 |
use libvirtd || return 0 |
201 |
# From here, only libvirtd-related instructions, be warned! |
202 |
|
203 |
- newinitd "${FILESDIR}/libvirtd.init-r9" libvirtd || die |
204 |
- newconfd "${FILESDIR}/libvirtd.confd-r3" libvirtd || die |
205 |
+ newinitd "${S}/libvirtd.init" libvirtd || die |
206 |
+ newconfd "${FILESDIR}/libvirtd.confd-r4" libvirtd || die |
207 |
|
208 |
keepdir /var/lib/libvirt/images |
209 |
} |
210 |
|
211 |
|
212 |
|
213 |
1.229 app-emulation/libvirt/ChangeLog |
214 |
|
215 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.229&view=markup |
216 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?rev=1.229&content-type=text/plain |
217 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/libvirt/ChangeLog?r1=1.228&r2=1.229 |
218 |
|
219 |
Index: ChangeLog |
220 |
=================================================================== |
221 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v |
222 |
retrieving revision 1.228 |
223 |
retrieving revision 1.229 |
224 |
diff -u -r1.228 -r1.229 |
225 |
--- ChangeLog 30 Oct 2012 05:17:42 -0000 1.228 |
226 |
+++ ChangeLog 30 Oct 2012 05:49:45 -0000 1.229 |
227 |
@@ -1,6 +1,9 @@ |
228 |
# ChangeLog for app-emulation/libvirt |
229 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
230 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.228 2012/10/30 05:17:42 cardoe Exp $ |
231 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.229 2012/10/30 05:49:45 cardoe Exp $ |
232 |
+ |
233 |
+ 30 Oct 2012; Doug Goldstein <cardoe@g.o> libvirt-9999.ebuild: |
234 |
+ Update the live ebuild. |
235 |
|
236 |
30 Oct 2012; Doug Goldstein <cardoe@g.o> libvirt-0.10.2.1.ebuild, |
237 |
files/libvirtd.init-r10: |