[app-emulation/qemu] sync with tree

master
Robert Förster 9 years ago
parent fa0e57f179
commit 1ba46ed898
  1. 37
      app-emulation/qemu/qemu-2.0.0-r1.ebuild

@ -8,7 +8,7 @@ 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
user udev fcaps readme.gentoo pax-utils
BACKPORTS=
@ -214,6 +214,14 @@ pkg_pretend() {
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() {
@ -376,15 +384,21 @@ src_configure() {
python_export_best
softmmu_targets=
user_targets=
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && softmmu_targets+=",${target}-softmmu"
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
use "qemu_user_targets_${target}" && user_targets+=",${target}-linux-user"
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
[[ -n ${softmmu_targets} ]] && \
@ -417,9 +431,11 @@ src_compile() {
}
src_test() {
cd "${S}/softmmu-build"
emake -j1 check
emake -j1 check-report.html
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake -j1 check
emake -j1 check-report.html
fi
}
qemu_python_install() {
@ -444,9 +460,8 @@ src_install() {
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
if use test; then
dohtml check-report.html
fi
# 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

Loading…
Cancel
Save