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