1 |
jmbsvicetto 09/12/31 16:29:25 |
2 |
|
3 |
Modified: ChangeLog qemu-kvm-0.12.1.1.ebuild |
4 |
qemu-kvm-9999.ebuild |
5 |
Added: qemu-kvm-0.12.1.2.ebuild |
6 |
Log: |
7 |
Version bump. |
8 |
(Portage version: 2.2_rc61/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.13 app-emulation/qemu-kvm/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.13&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.13&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.12&r2=1.13 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v |
20 |
retrieving revision 1.12 |
21 |
retrieving revision 1.13 |
22 |
diff -u -r1.12 -r1.13 |
23 |
--- ChangeLog 30 Dec 2009 02:17:53 -0000 1.12 |
24 |
+++ ChangeLog 31 Dec 2009 16:29:24 -0000 1.13 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for app-emulation/qemu-kvm |
27 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.12 2009/12/30 02:17:53 jmbsvicetto Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.13 2009/12/31 16:29:24 jmbsvicetto Exp $ |
30 |
+ |
31 |
+*qemu-kvm-0.12.1.2 (31 Dec 2009) |
32 |
+ |
33 |
+ 31 Dec 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@g.o> |
34 |
+ qemu-kvm-0.12.1.1.ebuild, +qemu-kvm-0.12.1.2.ebuild, qemu-kvm-9999.ebuild: |
35 |
+ Version bump. |
36 |
|
37 |
*qemu-kvm-9999 (30 Dec 2009) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.5 app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild?rev=1.5&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild?rev=1.5&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild?r1=1.4&r2=1.5 |
47 |
|
48 |
Index: qemu-kvm-0.12.1.1.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild,v |
51 |
retrieving revision 1.4 |
52 |
retrieving revision 1.5 |
53 |
diff -u -r1.4 -r1.5 |
54 |
--- qemu-kvm-0.12.1.1.ebuild 30 Dec 2009 02:17:53 -0000 1.4 |
55 |
+++ qemu-kvm-0.12.1.1.ebuild 31 Dec 2009 16:29:24 -0000 1.5 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2009 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild,v 1.4 2009/12/30 02:17:53 jmbsvicetto Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.1.ebuild,v 1.5 2009/12/31 16:29:24 jmbsvicetto Exp $ |
61 |
|
62 |
EAPI="2" |
63 |
|
64 |
@@ -15,7 +15,7 @@ |
65 |
SRC_URI="" |
66 |
KEYWORDS="" |
67 |
else |
68 |
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
69 |
+ SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz" |
70 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
71 |
fi |
72 |
|
73 |
|
74 |
|
75 |
|
76 |
1.2 app-emulation/qemu-kvm/qemu-kvm-9999.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.2&view=markup |
79 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?rev=1.2&content-type=text/plain |
80 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild?r1=1.1&r2=1.2 |
81 |
|
82 |
Index: qemu-kvm-9999.ebuild |
83 |
=================================================================== |
84 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v |
85 |
retrieving revision 1.1 |
86 |
retrieving revision 1.2 |
87 |
diff -u -r1.1 -r1.2 |
88 |
--- qemu-kvm-9999.ebuild 30 Dec 2009 02:17:53 -0000 1.1 |
89 |
+++ qemu-kvm-9999.ebuild 31 Dec 2009 16:29:24 -0000 1.2 |
90 |
@@ -1,6 +1,6 @@ |
91 |
# Copyright 1999-2009 Gentoo Foundation |
92 |
# Distributed under the terms of the GNU General Public License v2 |
93 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.1 2009/12/30 02:17:53 jmbsvicetto Exp $ |
94 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-9999.ebuild,v 1.2 2009/12/31 16:29:24 jmbsvicetto Exp $ |
95 |
|
96 |
EAPI="2" |
97 |
|
98 |
@@ -15,7 +15,7 @@ |
99 |
SRC_URI="" |
100 |
KEYWORDS="" |
101 |
else |
102 |
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" |
103 |
+ SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz" |
104 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
105 |
fi |
106 |
|
107 |
|
108 |
|
109 |
|
110 |
1.1 app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild |
111 |
|
112 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild?rev=1.1&view=markup |
113 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild?rev=1.1&content-type=text/plain |
114 |
|
115 |
Index: qemu-kvm-0.12.1.2.ebuild |
116 |
=================================================================== |
117 |
# Copyright 1999-2009 Gentoo Foundation |
118 |
# Distributed under the terms of the GNU General Public License v2 |
119 |
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.12.1.2.ebuild,v 1.1 2009/12/31 16:29:24 jmbsvicetto Exp $ |
120 |
|
121 |
EAPI="2" |
122 |
|
123 |
if [[ ${PV} = *9999* ]]; then |
124 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git" |
125 |
GIT_ECLASS="git" |
126 |
fi |
127 |
|
128 |
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs |
129 |
|
130 |
if [[ ${PV} = *9999* ]]; then |
131 |
SRC_URI="" |
132 |
KEYWORDS="" |
133 |
else |
134 |
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz" |
135 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
136 |
fi |
137 |
|
138 |
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |
139 |
HOMEPAGE="http://www.linux-kvm.org" |
140 |
|
141 |
LICENSE="GPL-2" |
142 |
SLOT="0" |
143 |
# xen is disabled until the deps are fixed |
144 |
IUSE="+aio alsa bluetooth curl esd gnutls fdt hardened kvm-trace ncurses \ |
145 |
pulseaudio sasl +sdl vde" |
146 |
|
147 |
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" |
148 |
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" |
149 |
IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus" |
150 |
|
151 |
for target in ${IUSE_SOFTMMU_TARGETS}; do |
152 |
IUSE="${IUSE} +qemu_softmmu_targets_${target}" |
153 |
done |
154 |
|
155 |
for target in ${IUSE_USER_TARGETS}; do |
156 |
IUSE="${IUSE} +qemu_user_targets_${target}" |
157 |
done |
158 |
|
159 |
RESTRICT="test" |
160 |
|
161 |
RDEPEND=" |
162 |
!app-emulation/kqemu |
163 |
!app-emulation/qemu |
164 |
!app-emulation/qemu-softmmu |
165 |
!app-emulation/qemu-user |
166 |
sys-apps/pciutils |
167 |
>=sys-apps/util-linux-2.16.0 |
168 |
sys-libs/zlib |
169 |
aio? ( dev-libs/libaio ) |
170 |
alsa? ( >=media-libs/alsa-lib-1.0.13 ) |
171 |
bluetooth? ( net-wireless/bluez ) |
172 |
curl? ( net-misc/curl ) |
173 |
esd? ( media-sound/esound ) |
174 |
fdt? ( sys-apps/dtc ) |
175 |
gnutls? ( net-libs/gnutls ) |
176 |
ncurses? ( sys-libs/ncurses ) |
177 |
pulseaudio? ( media-sound/pulseaudio ) |
178 |
sasl? ( dev-libs/cyrus-sasl ) |
179 |
sdl? ( >=media-libs/libsdl-1.2.11[X] ) |
180 |
vde? ( net-misc/vde ) |
181 |
" |
182 |
|
183 |
DEPEND="${RDEPEND} |
184 |
app-text/texi2html |
185 |
>=sys-kernel/linux-headers-2.6.29 |
186 |
gnutls? ( dev-util/pkgconfig )" |
187 |
|
188 |
kvm_kern_war() { |
189 |
eerror "Please enable KVM support in your kernel, found at:" |
190 |
eerror |
191 |
eerror " Virtualization" |
192 |
eerror " Kernel-based Virtual Machine (KVM) support" |
193 |
eerror |
194 |
} |
195 |
|
196 |
pkg_setup() { |
197 |
if kernel_is lt 2 6 25; then |
198 |
eerror "This version of KVM requres a host kernel of 2.6.25 or higher." |
199 |
eerror "Either upgrade your kernel" |
200 |
die "qemu-kvm version not compatible" |
201 |
else |
202 |
if ! linux_config_exists; then |
203 |
eerror "Unable to check your kernel for KVM support" |
204 |
kvm_kern_warn |
205 |
elif ! linux_chkconfig_present KVM; then |
206 |
kvm_kern_warn |
207 |
fi |
208 |
fi |
209 |
|
210 |
enewgroup kvm |
211 |
} |
212 |
|
213 |
src_prepare() { |
214 |
# avoid fdt till an updated release appears |
215 |
sed -i -e 's:fdt="yes":fdt="no":' configure || die |
216 |
# prevent docs to get automatically installed |
217 |
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die |
218 |
# Alter target makefiles to accept CFLAGS set via flag-o |
219 |
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \ |
220 |
Makefile Makefile.target || die |
221 |
# append CFLAGS while linking |
222 |
sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die |
223 |
|
224 |
# remove part to make udev happy |
225 |
sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die |
226 |
|
227 |
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch" |
228 |
} |
229 |
|
230 |
src_configure() { |
231 |
local conf_opts audio_opts softmmu_targets user_targets |
232 |
|
233 |
for target in ${IUSE_SOFTMMU_TARGETS} ; do |
234 |
use "qemu_softmmu_targets_${target}" && \ |
235 |
softmmu_targets="${softmmu_targets} ${target}-softmmu" |
236 |
done |
237 |
|
238 |
for target in ${IUSE_USER_TARGETS} ; do |
239 |
use "qemu_user_targets_${target}" && \ |
240 |
user_targets="${user_targets} ${target}-linux-user" |
241 |
done |
242 |
|
243 |
if [ ! -z "${softmmu_targets}" ]; then |
244 |
einfo "Building the following softmmu targets: ${softmmu_targets}" |
245 |
fi |
246 |
|
247 |
if [ ! -z "${user_targets}" ]; then |
248 |
einfo "Building the following user targets: ${user_targets}" |
249 |
conf_opts="${conf_opts} --enable-linux-user" |
250 |
else |
251 |
conf_opts="${conf_opts} --disable-linux-user" |
252 |
fi |
253 |
|
254 |
#config options |
255 |
conf_opts="${conf_opts} $(use_enable aio linux-aio)" |
256 |
use bluetooth || conf_opts="${conf_opts} --disable-bluez" |
257 |
conf_opts="${conf_opts} $(use_enable curl)" |
258 |
use gnutls || conf_opts="${conf_opts} --disable-vnc-tls" |
259 |
conf_opts="${conf_opts} $(use_enable fdt)" |
260 |
use hardened && conf_opts="${conf_opts} --enable-user-pie" |
261 |
use kvm-trace && conf_opts="${conf_opts} --with-kvm-trace" |
262 |
use ncurses || conf_opts="${conf_opts} --disable-curses" |
263 |
use sasl || conf_opts="${conf_opts} --disable-vnc-sasl" |
264 |
use sdl || conf_opts="${conf_opts} --disable-sdl" |
265 |
use vde || conf_opts="${conf_opts} --disable-vde" |
266 |
# conf_opts="${conf_opts} $(use_enable xen)" |
267 |
conf_opts="${conf_opts} --disable-xen" |
268 |
conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user" |
269 |
|
270 |
# audio options |
271 |
audio_opts="oss" |
272 |
use alsa && audio_opts="alsa ${audio_opts}" |
273 |
use esd && audio_opts="esd ${audio_opts}" |
274 |
use pulseaudio && audio_opts="pa ${audio_opts}" |
275 |
use sdl && audio_opts="sdl ${audio_opts}" |
276 |
./configure --prefix=/usr \ |
277 |
--disable-strip \ |
278 |
--enable-kvm \ |
279 |
--enable-nptl \ |
280 |
--enable-uuid \ |
281 |
${conf_opts} \ |
282 |
--audio-drv-list="${audio_opts}" \ |
283 |
--target-list="${softmmu_targets} ${user_targets}" \ |
284 |
--cc=$(tc-getCC) \ |
285 |
--host-cc=$(tc-getCC) \ |
286 |
|| die "configure failed" |
287 |
|
288 |
# this is for qemu upstream's threaded support which is |
289 |
# in development and broken |
290 |
# the kvm project has its own support for threaded IO |
291 |
# which is always on and works |
292 |
# --enable-io-thread \ |
293 |
} |
294 |
|
295 |
src_install() { |
296 |
emake DESTDIR="${D}" install || die "make install failed" |
297 |
|
298 |
insinto /etc/udev/rules.d/ |
299 |
doins kvm/scripts/65-kvm.rules || die |
300 |
|
301 |
insinto /etc/qemu/ |
302 |
insopts -m0755 |
303 |
doins kvm/scripts/qemu-ifup || die |
304 |
|
305 |
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die |
306 |
newdoc pc-bios/README README.pc-bios || die |
307 |
dohtml qemu-doc.html qemu-tech.html || die |
308 |
|
309 |
dobin "${FILESDIR}"/qemu-kvm |
310 |
dosym /usr/bin/qemu-kvm /usr/bin/kvm |
311 |
} |
312 |
|
313 |
pkg_postinst() { |
314 |
elog "If you don't have kvm compiled into the kernel, make sure you have" |
315 |
elog "the kernel module loaded before running kvm. The easiest way to" |
316 |
elog "ensure that the kernel module is loaded is to load it on boot." |
317 |
elog "For AMD CPUs the module is called 'kvm-amd'" |
318 |
elog "For Intel CPUs the module is called 'kvm-intel'" |
319 |
elog "Please review /etc/conf.d/modules for how to load these" |
320 |
elog |
321 |
elog "Make sure your user is in the 'kvm' group" |
322 |
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login." |
323 |
elog |
324 |
elog "You will need the Universal TUN/TAP driver compiled into your" |
325 |
elog "kernel or loaded as a module to use the virtual network device" |
326 |
elog "if using -net tap. You will also need support for 802.1d" |
327 |
elog "Ethernet Bridging and a configured bridge if using the provided" |
328 |
elog "kvm-ifup script from /etc/kvm." |
329 |
echo |
330 |
} |