[app-emulation/qemu] version bump, remove old, 2.2 release is around the corner
This commit is contained in:
parent
91ca22bba5
commit
5c78f87585
@ -1,2 +1 @@
|
|||||||
DIST qemu-2.1.2.tar.bz2 23563255 SHA256 fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885 SHA512 73ef758c82b23eec649c807bee8937d7fbf267278f7777adbdb22b738672543b826d211a4b523f38cee3e2b01f05ccf40a75756fc19c911362988d8e86d5cd58 WHIRLPOOL 5703d0aa8bb4366bb7aeb44fa4f3d1b54f188de42cd8c82e894584f627802b80a3dde1aa3b15fe8602a1891ec61ac66b3cd44ec031385cca88768f375c15b554
|
DIST qemu-2.2.0-rc5.tar.bz2 24337577 SHA256 77a11267be97f252626e2032b7b213a9d6e082dd81f2c5bb29368010d2017614 SHA512 abdddf98be4cb133c6bafc829f0d34c98c8b0dcab2e9644bf806cd614b3e2a196675d558f25cce83d2043378969c4ad20c33693b2c9cf70ce5e71384060b1b36 WHIRLPOOL f91ffeb5d1434979fe78fe409490a7dc6cc3b191db18cda4456269a0ef8756e657071396fc1aa597302d4c298b7dc1564278888527bc2dab2b3db6c4f18180a2
|
||||||
DIST qemu-2.2.0-rc4.tar.bz2 24339521 SHA256 8c4f31cefb44d25fb48c876f726deea76e7a5f51a990882e7e14a36c146b7237 SHA512 c9d214cdb636b8244add688a5d1c3ee789c6702d63e061bb10c4f7891d35b2f725fab83de04e6f6d84a119cf5c4247715c30f5f833f862112f6eb029ecfff3ad WHIRLPOOL 63deadc8753acd74c5eeb254abfeeab587d296908f03c95be345ab7ef860a5a386878a16ab66b081462933225e738369a15e67fa8a46023b8241ea2ff0132683
|
|
||||||
|
|||||||
@ -1,81 +0,0 @@
|
|||||||
fix already in upstream
|
|
||||||
|
|
||||||
From f17f4989fa193fa8279474c5462289a3cfe69aea Mon Sep 17 00:00:00 2001
|
|
||||||
From: Mike Frysinger <vapier@chromium.org>
|
|
||||||
Date: Fri, 8 Aug 2014 09:40:25 +0900
|
|
||||||
Subject: [PATCH] linux-user: fix readlink handling with magic exe symlink
|
|
||||||
|
|
||||||
The current code always returns the length of the path when it should
|
|
||||||
be returning the number of bytes it wrote to the output string.
|
|
||||||
|
|
||||||
Further, readlink is not supposed to append a NUL byte, but the current
|
|
||||||
snprintf logic will always do just that.
|
|
||||||
|
|
||||||
Even further, if you pass in a length of 0, you're suppoesd to get back
|
|
||||||
an error (EINVAL), but the current logic just returns 0.
|
|
||||||
|
|
||||||
Further still, if there was an error reading the symlink, we should not
|
|
||||||
go ahead and try to read the target buffer as it is garbage.
|
|
||||||
|
|
||||||
Simple test for the first two issues:
|
|
||||||
$ cat test.c
|
|
||||||
int main() {
|
|
||||||
char buf[50];
|
|
||||||
size_t len;
|
|
||||||
for (len = 0; len < 10; ++len) {
|
|
||||||
memset(buf, '!', sizeof(buf));
|
|
||||||
ssize_t ret = readlink("/proc/self/exe", buf, len);
|
|
||||||
buf[20] = '\0';
|
|
||||||
printf("readlink(/proc/self/exe, {%s}, %zu) = %zi\n", buf, len, ret);
|
|
||||||
}
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Now compare the output of the native:
|
|
||||||
$ gcc test.c -o /tmp/x
|
|
||||||
$ /tmp/x
|
|
||||||
$ strace /tmp/x
|
|
||||||
|
|
||||||
With what qemu does:
|
|
||||||
$ armv7a-cros-linux-gnueabi-gcc test.c -o /tmp/x -static
|
|
||||||
$ qemu-arm /tmp/x
|
|
||||||
$ qemu-arm -strace /tmp/x
|
|
||||||
|
|
||||||
Signed-off-by: Mike Frysinger <vapier@chromium.org>
|
|
||||||
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
|
|
||||||
---
|
|
||||||
linux-user/syscall.c | 15 +++++++++++++--
|
|
||||||
1 file changed, 13 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
||||||
index fccf9f0..7c108ab 100644
|
|
||||||
--- a/linux-user/syscall.c
|
|
||||||
+++ b/linux-user/syscall.c
|
|
||||||
@@ -6636,11 +6636,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
|
|
||||||
p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0);
|
|
||||||
if (!p || !p2) {
|
|
||||||
ret = -TARGET_EFAULT;
|
|
||||||
+ } else if (!arg3) {
|
|
||||||
+ /* Short circuit this for the magic exe check. */
|
|
||||||
+ ret = -TARGET_EINVAL;
|
|
||||||
} else if (is_proc_myself((const char *)p, "exe")) {
|
|
||||||
char real[PATH_MAX], *temp;
|
|
||||||
temp = realpath(exec_path, real);
|
|
||||||
- ret = temp == NULL ? get_errno(-1) : strlen(real) ;
|
|
||||||
- snprintf((char *)p2, arg3, "%s", real);
|
|
||||||
+ /* Return value is # of bytes that we wrote to the buffer. */
|
|
||||||
+ if (temp == NULL) {
|
|
||||||
+ ret = get_errno(-1);
|
|
||||||
+ } else {
|
|
||||||
+ /* Don't worry about sign mismatch as earlier mapping
|
|
||||||
+ * logic would have thrown a bad address error. */
|
|
||||||
+ ret = MIN(strlen(real), arg3);
|
|
||||||
+ /* We cannot NUL terminate the string. */
|
|
||||||
+ memcpy(p2, real, ret);
|
|
||||||
+ }
|
|
||||||
} else {
|
|
||||||
ret = get_errno(readlink(path(p), p2, arg3));
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.0.0
|
|
||||||
|
|
||||||
@ -1,50 +0,0 @@
|
|||||||
https://bugs.gentoo.org/527088
|
|
||||||
|
|
||||||
From e6908bfe8e07f2b452e78e677da1b45b1c0f6829 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Petr Matousek <pmatouse@redhat.com>
|
|
||||||
Date: Mon, 27 Oct 2014 12:41:44 +0100
|
|
||||||
Subject: [PATCH] vnc: sanitize bits_per_pixel from the client
|
|
||||||
|
|
||||||
bits_per_pixel that are less than 8 could result in accessing
|
|
||||||
non-initialized buffers later in the code due to the expectation
|
|
||||||
that bytes_per_pixel value that is used to initialize these buffers is
|
|
||||||
never zero.
|
|
||||||
|
|
||||||
To fix this check that bits_per_pixel from the client is one of the
|
|
||||||
values that the rfb protocol specification allows.
|
|
||||||
|
|
||||||
This is CVE-2014-7815.
|
|
||||||
|
|
||||||
Signed-off-by: Petr Matousek <pmatouse@redhat.com>
|
|
||||||
|
|
||||||
[ kraxel: apply codestyle fix ]
|
|
||||||
|
|
||||||
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
||||||
---
|
|
||||||
ui/vnc.c | 10 ++++++++++
|
|
||||||
1 file changed, 10 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/ui/vnc.c b/ui/vnc.c
|
|
||||||
index 0fe6eff..8bca597 100644
|
|
||||||
--- a/ui/vnc.c
|
|
||||||
+++ b/ui/vnc.c
|
|
||||||
@@ -2026,6 +2026,16 @@ static void set_pixel_format(VncState *vs,
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ switch (bits_per_pixel) {
|
|
||||||
+ case 8:
|
|
||||||
+ case 16:
|
|
||||||
+ case 32:
|
|
||||||
+ break;
|
|
||||||
+ default:
|
|
||||||
+ vnc_client_error(vs);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
vs->client_pf.rmax = red_max;
|
|
||||||
vs->client_pf.rbits = hweight_long(red_max);
|
|
||||||
vs->client_pf.rshift = red_shift;
|
|
||||||
--
|
|
||||||
2.1.2
|
|
||||||
|
|
||||||
@ -1,605 +0,0 @@
|
|||||||
# Copyright 1999-2014 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.2-r1.ebuild,v 1.1 2014/11/02 11:57:18 swift Exp $
|
|
||||||
|
|
||||||
EAPI=5
|
|
||||||
|
|
||||||
#MY_P="${P/_/-}"
|
|
||||||
|
|
||||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
|
||||||
PYTHON_REQ_USE="ncurses,readline"
|
|
||||||
|
|
||||||
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
|
|
||||||
user udev fcaps readme.gentoo pax-utils
|
|
||||||
|
|
||||||
BACKPORTS=
|
|
||||||
|
|
||||||
if [[ ${PV} = *9999* ]]; then
|
|
||||||
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
|
|
||||||
inherit git-2
|
|
||||||
SRC_URI=""
|
|
||||||
KEYWORDS=""
|
|
||||||
else
|
|
||||||
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
|
|
||||||
${BACKPORTS:+
|
|
||||||
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
|
|
||||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
|
|
||||||
fi
|
|
||||||
|
|
||||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
|
||||||
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
|
|
||||||
|
|
||||||
LICENSE="GPL-2 LGPL-2 BSD-2"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
|
|
||||||
gtk infiniband iscsi +jpeg \
|
|
||||||
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
|
|
||||||
+png pulseaudio python \
|
|
||||||
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
|
|
||||||
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
|
|
||||||
virtfs +vnc xattr xen xfs"
|
|
||||||
|
|
||||||
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
|
|
||||||
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
|
|
||||||
x86_64"
|
|
||||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
|
|
||||||
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
|
|
||||||
|
|
||||||
use_targets="
|
|
||||||
$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
|
|
||||||
$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
|
|
||||||
"
|
|
||||||
IUSE+=" ${use_targets}"
|
|
||||||
|
|
||||||
# Require at least one softmmu or user target.
|
|
||||||
# Block USE flag configurations known to not work.
|
|
||||||
REQUIRED_USE="|| ( ${use_targets} )
|
|
||||||
${PYTHON_REQUIRED_USE}
|
|
||||||
qemu_softmmu_targets_arm? ( fdt )
|
|
||||||
qemu_softmmu_targets_microblaze? ( fdt )
|
|
||||||
qemu_softmmu_targets_ppc? ( fdt )
|
|
||||||
qemu_softmmu_targets_ppc64? ( fdt )
|
|
||||||
static? ( static-softmmu static-user )
|
|
||||||
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
|
|
||||||
virtfs? ( xattr )"
|
|
||||||
|
|
||||||
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
|
|
||||||
#
|
|
||||||
# The attr lib isn't always linked in (although the USE flag is always
|
|
||||||
# respected). This is because qemu supports using the C library's API
|
|
||||||
# when available rather than always using the extranl library.
|
|
||||||
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
|
|
||||||
sys-libs/zlib[static-libs(+)]
|
|
||||||
xattr? ( sys-apps/attr[static-libs(+)] )"
|
|
||||||
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
|
|
||||||
>=x11-libs/pixman-0.28.0[static-libs(+)]
|
|
||||||
aio? ( dev-libs/libaio[static-libs(+)] )
|
|
||||||
caps? ( sys-libs/libcap-ng[static-libs(+)] )
|
|
||||||
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
|
|
||||||
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
|
|
||||||
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
|
|
||||||
infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
|
|
||||||
jpeg? ( virtual/jpeg[static-libs(+)] )
|
|
||||||
lzo? ( dev-libs/lzo:2[static-libs(+)] )
|
|
||||||
ncurses? ( sys-libs/ncurses[static-libs(+)] )
|
|
||||||
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
|
|
||||||
numa? ( sys-process/numactl[static-libs(+)] )
|
|
||||||
png? ( media-libs/libpng[static-libs(+)] )
|
|
||||||
rbd? ( sys-cluster/ceph[static-libs(+)] )
|
|
||||||
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
|
|
||||||
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
|
|
||||||
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
|
|
||||||
snappy? ( app-arch/snappy[static-libs(+)] )
|
|
||||||
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
|
|
||||||
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
|
|
||||||
tls? ( net-libs/gnutls[static-libs(+)] )
|
|
||||||
usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
|
|
||||||
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
|
|
||||||
vde? ( net-misc/vde[static-libs(+)] )
|
|
||||||
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
|
|
||||||
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
|
|
||||||
X86_FIRMWARE_DEPEND="
|
|
||||||
>=sys-firmware/ipxe-1.0.0_p20130624
|
|
||||||
pin-upstream-blobs? (
|
|
||||||
~sys-firmware/seabios-1.7.5
|
|
||||||
~sys-firmware/sgabios-0.1_pre8
|
|
||||||
~sys-firmware/vgabios-0.7a
|
|
||||||
)
|
|
||||||
!pin-upstream-blobs? (
|
|
||||||
sys-firmware/seabios
|
|
||||||
sys-firmware/sgabios
|
|
||||||
)"
|
|
||||||
CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
|
|
||||||
!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
|
|
||||||
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
|
|
||||||
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
|
|
||||||
accessibility? ( app-accessibility/brltty )
|
|
||||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
|
||||||
bluetooth? ( net-wireless/bluez )
|
|
||||||
gtk? (
|
|
||||||
x11-libs/gtk+:3
|
|
||||||
x11-libs/vte:2.90
|
|
||||||
)
|
|
||||||
iscsi? ( net-libs/libiscsi )
|
|
||||||
opengl? ( virtual/opengl )
|
|
||||||
pulseaudio? ( media-sound/pulseaudio )
|
|
||||||
python? ( ${PYTHON_DEPS} )
|
|
||||||
sdl? ( media-libs/libsdl[X] )
|
|
||||||
smartcard? ( dev-libs/nss !app-emulation/libcacard )
|
|
||||||
spice? ( >=app-emulation/spice-protocol-0.12.3 )
|
|
||||||
systemtap? ( dev-util/systemtap )
|
|
||||||
usbredir? ( >=sys-apps/usbredir-0.6 )
|
|
||||||
virtfs? ( sys-libs/libcap )
|
|
||||||
xen? ( app-emulation/xen-tools )"
|
|
||||||
DEPEND="${CDEPEND}
|
|
||||||
dev-lang/perl
|
|
||||||
=dev-lang/python-2*
|
|
||||||
sys-apps/texinfo
|
|
||||||
virtual/pkgconfig
|
|
||||||
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
|
|
||||||
gtk? ( nls? ( sys-devel/gettext ) )
|
|
||||||
static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
|
|
||||||
static-user? ( ${USER_LIB_DEPEND} )
|
|
||||||
test? (
|
|
||||||
dev-libs/glib[utils]
|
|
||||||
sys-devel/bc
|
|
||||||
)"
|
|
||||||
RDEPEND="${CDEPEND}
|
|
||||||
selinux? ( sec-policy/selinux-qemu )
|
|
||||||
"
|
|
||||||
|
|
||||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
|
||||||
|
|
||||||
QA_PREBUILT="
|
|
||||||
usr/share/qemu/openbios-ppc
|
|
||||||
usr/share/qemu/openbios-sparc64
|
|
||||||
usr/share/qemu/openbios-sparc32
|
|
||||||
usr/share/qemu/palcode-clipper
|
|
||||||
usr/share/qemu/s390-ccw.img
|
|
||||||
usr/share/qemu/u-boot.e500
|
|
||||||
"
|
|
||||||
|
|
||||||
QA_WX_LOAD="usr/bin/qemu-i386
|
|
||||||
usr/bin/qemu-x86_64
|
|
||||||
usr/bin/qemu-alpha
|
|
||||||
usr/bin/qemu-arm
|
|
||||||
usr/bin/qemu-cris
|
|
||||||
usr/bin/qemu-m68k
|
|
||||||
usr/bin/qemu-microblaze
|
|
||||||
usr/bin/qemu-microblazeel
|
|
||||||
usr/bin/qemu-mips
|
|
||||||
usr/bin/qemu-mipsel
|
|
||||||
usr/bin/qemu-or32
|
|
||||||
usr/bin/qemu-ppc
|
|
||||||
usr/bin/qemu-ppc64
|
|
||||||
usr/bin/qemu-ppc64abi32
|
|
||||||
usr/bin/qemu-sh4
|
|
||||||
usr/bin/qemu-sh4eb
|
|
||||||
usr/bin/qemu-sparc
|
|
||||||
usr/bin/qemu-sparc64
|
|
||||||
usr/bin/qemu-armeb
|
|
||||||
usr/bin/qemu-sparc32plus
|
|
||||||
usr/bin/qemu-s390x
|
|
||||||
usr/bin/qemu-unicore32"
|
|
||||||
|
|
||||||
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
|
|
||||||
you have the kernel module loaded before running kvm. The easiest way to
|
|
||||||
ensure that the kernel module is loaded is to load it on boot.\n
|
|
||||||
For AMD CPUs the module is called 'kvm-amd'\n
|
|
||||||
For Intel CPUs the module is called 'kvm-intel'\n
|
|
||||||
Please review /etc/conf.d/modules for how to load these\n\n
|
|
||||||
Make sure your user is in the 'kvm' group\n
|
|
||||||
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
|
||||||
|
|
||||||
qemu_support_kvm() {
|
|
||||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
|
|
||||||
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
|
|
||||||
use qemu_softmmu_targets_s390x; then
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_pretend() {
|
|
||||||
if use kernel_linux && kernel_is lt 2 6 25; then
|
|
||||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
|
||||||
elif use kernel_linux; then
|
|
||||||
if ! linux_config_exists; then
|
|
||||||
eerror "Unable to check your kernel for KVM support"
|
|
||||||
else
|
|
||||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
|
||||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
|
||||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
|
||||||
ERROR_KVM_AMD+=" your kernel configuration."
|
|
||||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
|
||||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
|
||||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
|
||||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
|
||||||
ERROR_TUN+=" virtual network device if using -net tap."
|
|
||||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
|
||||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
|
||||||
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
|
|
||||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
|
||||||
ERROR_VHOST_NET+=" support"
|
|
||||||
|
|
||||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
|
||||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
|
||||||
fi
|
|
||||||
|
|
||||||
use python && CONFIG_CHECK+=" ~DEBUG_FS"
|
|
||||||
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
|
|
||||||
|
|
||||||
# Now do the actual checks setup above
|
|
||||||
check_extra_config
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
|
|
||||||
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
|
|
||||||
eerror "instances are still pointing to it. Please update your"
|
|
||||||
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
|
|
||||||
eerror "and the right system binary (e.g. qemu-system-x86_64)."
|
|
||||||
die "update your virt configs to not use qemu-kvm"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_setup() {
|
|
||||||
enewgroup kvm 78
|
|
||||||
}
|
|
||||||
|
|
||||||
#S="${WORKDIR}/${MY_P}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
|
||||||
sed -i -r \
|
|
||||||
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
|
|
||||||
Makefile Makefile.target || die
|
|
||||||
|
|
||||||
# Cheap hack to disable gettext .mo generation.
|
|
||||||
use nls || rm -f po/*.po
|
|
||||||
|
|
||||||
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
|
|
||||||
[[ -n ${BACKPORTS} ]] && \
|
|
||||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
|
||||||
epatch
|
|
||||||
|
|
||||||
# Fix ld and objcopy being called directly
|
|
||||||
tc-export AR LD OBJCOPY
|
|
||||||
|
|
||||||
# Verbose builds
|
|
||||||
MAKEOPTS+=" V=1"
|
|
||||||
|
|
||||||
epatch_user
|
|
||||||
}
|
|
||||||
|
|
||||||
##
|
|
||||||
# configures qemu based on the build directory and the build type
|
|
||||||
# we are using.
|
|
||||||
#
|
|
||||||
qemu_src_configure() {
|
|
||||||
debug-print-function ${FUNCNAME} "$@"
|
|
||||||
|
|
||||||
local buildtype=$1
|
|
||||||
local builddir=$2
|
|
||||||
local static_flag="static-${buildtype}"
|
|
||||||
|
|
||||||
# audio options
|
|
||||||
local audio_opts="oss"
|
|
||||||
use alsa && audio_opts="alsa,${audio_opts}"
|
|
||||||
use sdl && audio_opts="sdl,${audio_opts}"
|
|
||||||
use pulseaudio && audio_opts="pa,${audio_opts}"
|
|
||||||
|
|
||||||
local conf_opts=(
|
|
||||||
--prefix=/usr
|
|
||||||
--sysconfdir=/etc
|
|
||||||
--libdir=/usr/$(get_libdir)
|
|
||||||
--docdir=/usr/share/doc/${PF}/html
|
|
||||||
--disable-bsd-user
|
|
||||||
--disable-guest-agent
|
|
||||||
--disable-strip
|
|
||||||
--disable-werror
|
|
||||||
--python="${PYTHON}"
|
|
||||||
--cc="$(tc-getCC)"
|
|
||||||
--cxx="$(tc-getCXX)"
|
|
||||||
--host-cc="$(tc-getBUILD_CC)"
|
|
||||||
$(use_enable debug debug-info)
|
|
||||||
$(use_enable debug debug-tcg)
|
|
||||||
--enable-docs
|
|
||||||
$(use_enable tci tcg-interpreter)
|
|
||||||
$(use_enable xattr attr)
|
|
||||||
)
|
|
||||||
|
|
||||||
# Disable options not used by user targets as the default configure
|
|
||||||
# options will autoprobe and try to link in a bunch of unused junk.
|
|
||||||
conf_softmmu() {
|
|
||||||
if [[ ${buildtype} == "user" ]] ; then
|
|
||||||
echo "--disable-${2:-$1}"
|
|
||||||
else
|
|
||||||
use_enable "$@"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
conf_opts+=(
|
|
||||||
$(conf_softmmu accessibility brlapi)
|
|
||||||
$(conf_softmmu aio linux-aio)
|
|
||||||
$(conf_softmmu bluetooth bluez)
|
|
||||||
$(conf_softmmu caps cap-ng)
|
|
||||||
$(conf_softmmu curl)
|
|
||||||
$(conf_softmmu fdt)
|
|
||||||
$(conf_softmmu glusterfs)
|
|
||||||
$(conf_softmmu gtk)
|
|
||||||
$(conf_softmmu infiniband rdma)
|
|
||||||
$(conf_softmmu iscsi libiscsi)
|
|
||||||
$(conf_softmmu jpeg vnc-jpeg)
|
|
||||||
$(conf_softmmu kernel_linux kvm)
|
|
||||||
$(conf_softmmu lzo)
|
|
||||||
$(conf_softmmu ncurses curses)
|
|
||||||
$(conf_softmmu nfs libnfs)
|
|
||||||
$(conf_softmmu numa)
|
|
||||||
$(conf_softmmu opengl glx)
|
|
||||||
$(conf_softmmu png vnc-png)
|
|
||||||
$(conf_softmmu rbd)
|
|
||||||
$(conf_softmmu sasl vnc-sasl)
|
|
||||||
$(conf_softmmu sdl)
|
|
||||||
$(conf_softmmu seccomp)
|
|
||||||
$(conf_softmmu smartcard smartcard-nss)
|
|
||||||
$(conf_softmmu snappy)
|
|
||||||
$(conf_softmmu spice)
|
|
||||||
$(conf_softmmu ssh libssh2)
|
|
||||||
$(conf_softmmu tls quorum)
|
|
||||||
$(conf_softmmu tls vnc-tls)
|
|
||||||
$(conf_softmmu tls vnc-ws)
|
|
||||||
$(conf_softmmu usb libusb)
|
|
||||||
$(conf_softmmu usbredir usb-redir)
|
|
||||||
$(conf_softmmu uuid)
|
|
||||||
$(conf_softmmu vde)
|
|
||||||
$(conf_softmmu vhost-net)
|
|
||||||
$(conf_softmmu virtfs)
|
|
||||||
$(conf_softmmu vnc)
|
|
||||||
$(conf_softmmu xen)
|
|
||||||
$(conf_softmmu xen xen-pci-passthrough)
|
|
||||||
$(conf_softmmu xfs xfsctl)
|
|
||||||
)
|
|
||||||
|
|
||||||
case ${buildtype} in
|
|
||||||
user)
|
|
||||||
conf_opts+=(
|
|
||||||
--enable-linux-user
|
|
||||||
--disable-system
|
|
||||||
--target-list="${user_targets}"
|
|
||||||
--disable-blobs
|
|
||||||
--disable-tools
|
|
||||||
)
|
|
||||||
;;
|
|
||||||
softmmu)
|
|
||||||
conf_opts+=(
|
|
||||||
--disable-linux-user
|
|
||||||
--enable-system
|
|
||||||
--target-list="${softmmu_targets}"
|
|
||||||
--with-system-pixman
|
|
||||||
--audio-drv-list="${audio_opts}"
|
|
||||||
)
|
|
||||||
use gtk && conf_opts+=( --with-gtkabi=3.0 )
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Add support for SystemTAP
|
|
||||||
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
|
|
||||||
|
|
||||||
# We always want to attempt to build with PIE support as it results
|
|
||||||
# in a more secure binary. But it doesn't work with static or if
|
|
||||||
# the current GCC doesn't have PIE support.
|
|
||||||
if use ${static_flag}; then
|
|
||||||
conf_opts+=( --static --disable-pie )
|
|
||||||
else
|
|
||||||
gcc-specs-pie && conf_opts+=( --enable-pie )
|
|
||||||
fi
|
|
||||||
|
|
||||||
einfo "./configure ${conf_opts[*]}"
|
|
||||||
cd "${builddir}"
|
|
||||||
../configure "${conf_opts[@]}" || die "configure failed"
|
|
||||||
|
|
||||||
# FreeBSD's kernel does not support QEMU assigning/grabbing
|
|
||||||
# host USB devices yet
|
|
||||||
use kernel_FreeBSD && \
|
|
||||||
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
local target
|
|
||||||
|
|
||||||
python_export_best
|
|
||||||
|
|
||||||
softmmu_targets= softmmu_bins=()
|
|
||||||
user_targets= user_bins=()
|
|
||||||
|
|
||||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
|
||||||
if use "qemu_softmmu_targets_${target}"; then
|
|
||||||
softmmu_targets+=",${target}-softmmu"
|
|
||||||
softmmu_bins+=( "qemu-system-${target}" )
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
for target in ${IUSE_USER_TARGETS} ; do
|
|
||||||
if use "qemu_user_targets_${target}"; then
|
|
||||||
user_targets+=",${target}-linux-user"
|
|
||||||
user_bins+=( "qemu-${target}" )
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
[[ -n ${softmmu_targets} ]] && \
|
|
||||||
einfo "Building the following softmmu targets: ${softmmu_targets}"
|
|
||||||
|
|
||||||
[[ -n ${user_targets} ]] && \
|
|
||||||
einfo "Building the following user targets: ${user_targets}"
|
|
||||||
|
|
||||||
if [[ -n ${softmmu_targets} ]]; then
|
|
||||||
mkdir "${S}/softmmu-build"
|
|
||||||
qemu_src_configure "softmmu" "${S}/softmmu-build"
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n ${user_targets} ]]; then
|
|
||||||
mkdir "${S}/user-build"
|
|
||||||
qemu_src_configure "user" "${S}/user-build"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_compile() {
|
|
||||||
if [[ -n ${user_targets} ]]; then
|
|
||||||
cd "${S}/user-build"
|
|
||||||
default
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n ${softmmu_targets} ]]; then
|
|
||||||
cd "${S}/softmmu-build"
|
|
||||||
default
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
src_test() {
|
|
||||||
if [[ -n ${softmmu_targets} ]]; then
|
|
||||||
cd "${S}/softmmu-build"
|
|
||||||
pax-mark m */qemu-system-* #515550
|
|
||||||
emake -j1 check
|
|
||||||
emake -j1 check-report.html
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
qemu_python_install() {
|
|
||||||
python_domodule "${S}/scripts/qmp/qmp.py"
|
|
||||||
|
|
||||||
python_doscript "${S}/scripts/kvm/kvm_stat"
|
|
||||||
python_doscript "${S}/scripts/kvm/vmxcap"
|
|
||||||
python_doscript "${S}/scripts/qmp/qmp-shell"
|
|
||||||
python_doscript "${S}/scripts/qmp/qemu-ga-client"
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
if [[ -n ${user_targets} ]]; then
|
|
||||||
cd "${S}/user-build"
|
|
||||||
emake DESTDIR="${ED}" install
|
|
||||||
|
|
||||||
# Install binfmt handler init script for user targets
|
|
||||||
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -n ${softmmu_targets} ]]; then
|
|
||||||
cd "${S}/softmmu-build"
|
|
||||||
emake DESTDIR="${ED}" install
|
|
||||||
|
|
||||||
# This might not exist if the test failed. #512010
|
|
||||||
[[ -e check-report.html ]] && dohtml check-report.html
|
|
||||||
|
|
||||||
if use kernel_linux; then
|
|
||||||
udev_dorules "${FILESDIR}"/65-kvm.rules
|
|
||||||
fi
|
|
||||||
|
|
||||||
if use python; then
|
|
||||||
python_foreach_impl qemu_python_install
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
|
|
||||||
pushd "${ED}"/usr/bin >/dev/null
|
|
||||||
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
|
|
||||||
popd >/dev/null
|
|
||||||
|
|
||||||
# Install config file example for qemu-bridge-helper
|
|
||||||
insinto "/etc/qemu"
|
|
||||||
doins "${FILESDIR}/bridge.conf"
|
|
||||||
|
|
||||||
# Remove the docdir placed qmp-commands.txt
|
|
||||||
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
|
|
||||||
|
|
||||||
cd "${S}"
|
|
||||||
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
|
|
||||||
newdoc pc-bios/README README.pc-bios
|
|
||||||
dodoc docs/qmp/*.txt
|
|
||||||
|
|
||||||
# Remove SeaBIOS since we're using the SeaBIOS packaged ones
|
|
||||||
if [[ -n ${softmmu_targets} ]]; then
|
|
||||||
rm "${ED}/usr/share/qemu/bios.bin"
|
|
||||||
rm "${ED}/usr/share/qemu/bios-256k.bin"
|
|
||||||
rm "${ED}/usr/share/qemu/acpi-dsdt.aml"
|
|
||||||
rm "${ED}/usr/share/qemu/q35-acpi-dsdt.aml"
|
|
||||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
|
||||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
|
||||||
dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin
|
|
||||||
dosym ../seabios/acpi-dsdt.aml /usr/share/qemu/acpi-dsdt.aml
|
|
||||||
dosym ../seabios/q35-acpi-dsdt.aml /usr/share/qemu/q35-acpi-dsdt.aml
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove vgabios since we're using the seabios packaged one
|
|
||||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
|
||||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
|
||||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
|
||||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
|
||||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
|
||||||
dosym ../seabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
|
||||||
dosym ../seabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
|
||||||
dosym ../seabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
|
||||||
dosym ../seabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove sgabios since we're using the sgabios packaged one
|
|
||||||
rm "${ED}/usr/share/qemu/sgabios.bin"
|
|
||||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
|
||||||
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Remove iPXE since we're using the iPXE packaged one
|
|
||||||
rm "${ED}"/usr/share/qemu/pxe-*.rom
|
|
||||||
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
|
|
||||||
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
|
|
||||||
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
|
|
||||||
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
|
|
||||||
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
|
|
||||||
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
|
|
||||||
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
qemu_support_kvm && readme.gentoo_create_doc
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
if qemu_support_kvm; then
|
|
||||||
readme.gentoo_print_elog
|
|
||||||
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
|
|
||||||
ewarn "save states has been removed starting with the 1.6.2 release"
|
|
||||||
ewarn
|
|
||||||
ewarn "It is recommended that you migrate any VMs that may be running"
|
|
||||||
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
|
|
||||||
ewarn "any saved states with a newer qemu."
|
|
||||||
ewarn
|
|
||||||
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
|
|
||||||
|
|
||||||
if use x86 || use amd64; then
|
|
||||||
ewarn
|
|
||||||
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
|
|
||||||
ewarn "installed. In order to use kvm acceleration, pass the flag"
|
|
||||||
ewarn "-enable-kvm when running your system target."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
|
|
||||||
if use virtfs && [ -n "${softmmu_targets}" ]; then
|
|
||||||
local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
|
|
||||||
fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_info() {
|
|
||||||
echo "Using:"
|
|
||||||
echo " $(best_version app-emulation/spice-protocol)"
|
|
||||||
echo " $(best_version sys-firmware/ipxe)"
|
|
||||||
echo " $(best_version sys-firmware/seabios)"
|
|
||||||
if has_version sys-firmware/seabios[binary]; then
|
|
||||||
echo " USE=binary"
|
|
||||||
else
|
|
||||||
echo " USE=''"
|
|
||||||
fi
|
|
||||||
echo " $(best_version sys-firmware/vgabios)"
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user