vapier 14/08/04 06:45:21 Modified: ChangeLog Added: qemu-2.1.0.ebuild Log: Version bump #518806 by José Romildo Malaquias. Add aarch64 to the init script, and switch flags from P to OC until qemu itself can understand the extra argv[0] #512780 by Bertrand Jacquin. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.273 app-emulation/qemu/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.273&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.273&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.272&r2=1.273 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v retrieving revision 1.272 retrieving revision 1.273 diff -u -r1.272 -r1.273 --- ChangeLog 29 Jul 2014 10:23:00 -0000 1.272 +++ ChangeLog 4 Aug 2014 06:45:21 -0000 1.273 @@ -1,6 +1,14 @@ # ChangeLog for app-emulation/qemu # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.272 2014/07/29 10:23:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.273 2014/08/04 06:45:21 vapier Exp $ + +*qemu-2.1.0 (04 Aug 2014) + + 04 Aug 2014; Mike Frysinger <vap...@gentoo.org> +qemu-2.1.0.ebuild, + files/qemu-binfmt.initd-r1: + Version bump #518806 by José Romildo Malaquias. Add aarch64 to the init + script, and switch flags from P to OC until qemu itself can understand the + extra argv[0] #512780 by Bertrand Jacquin. 29 Jul 2014; Mike Frysinger <vap...@gentoo.org> qemu-2.0.0-r1.ebuild, qemu-9999.ebuild: 1.1 app-emulation/qemu/qemu-2.1.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-2.1.0.ebuild?rev=1.1&content-type=text/plain Index: qemu-2.1.0.ebuild =================================================================== # 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.0.ebuild,v 1.1 2014/08/04 06:45:21 vapier Exp $ EAPI=5 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 iscsi +jpeg \ kernel_linux kernel_FreeBSD ncurses nls opengl +png pulseaudio python \ rbd sasl +seccomp sdl selinux smartcard 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? ( ${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. COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)] sys-libs/zlib[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(+)] ) jpeg? ( virtual/jpeg[static-libs(+)] ) ncurses? ( sys-libs/ncurses[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(+)] ) 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(+)] ) xattr? ( sys-apps/attr[static-libs(+)] ) xfs? ( sys-fs/xfsprogs[static-libs(+)] )" USER_LIB_DEPEND="${COMMON_LIB_DEPEND}" RDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) qemu_softmmu_targets_i386? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) qemu_softmmu_targets_x86_64? ( >=sys-firmware/ipxe-1.0.0_p20130624 ~sys-firmware/seabios-1.7.5 ~sys-firmware/sgabios-0.1_pre8 ~sys-firmware/vgabios-0.7a ) 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] ) selinux? ( sec-policy/selinux-qemu ) 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="${RDEPEND} 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 )" 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" 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 } 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 [[ -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) ) case ${buildtype} in user) conf_opts+=( --enable-linux-user --disable-system --target-list="${user_targets}" --disable-blobs --disable-bluez --disable-curses --disable-kvm --disable-libiscsi --disable-glusterfs --disable-seccomp --disable-sdl --disable-smartcard-nss --disable-tools --disable-vde --disable-libssh2 --disable-libusb ) ;; softmmu) conf_opts+=( --disable-linux-user --enable-system --with-system-pixman --target-list="${softmmu_targets}" $(use_enable bluetooth bluez) $(use_enable gtk) $(use_enable sdl) $(use_enable aio linux-aio) $(use_enable accessibility brlapi) $(use_enable caps cap-ng) $(use_enable curl) $(use_enable fdt) $(use_enable glusterfs) $(use_enable iscsi libiscsi) $(use_enable jpeg vnc-jpeg) $(use_enable kernel_linux kvm) $(use_enable ncurses curses) $(use_enable opengl glx) $(use_enable png vnc-png) $(use_enable rbd) $(use_enable sasl vnc-sasl) $(use_enable seccomp) $(use_enable smartcard smartcard-nss) $(use_enable spice) $(use_enable ssh libssh2) $(use_enable tls vnc-tls) $(use_enable tls vnc-ws) $(use_enable usb libusb) $(use_enable usbredir usb-redir) $(use_enable uuid) $(use_enable vde) $(use_enable vhost-net) $(use_enable virtfs) $(use_enable vnc) $(use_enable xattr attr) $(use_enable xen) $(use_enable xen xen-pci-passthrough) $(use_enable xfs xfsctl) --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 one rm "${ED}/usr/share/qemu/bios.bin" if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then dosym ../seabios/bios.bin /usr/share/qemu/bios.bin fi # Remove vgabios since we're using the vgabios packaged one if [[ -n ${softmmu_targets} ]]; then rm "${ED}/usr/share/qemu/vgabios.bin" 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 ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin dosym ../vgabios/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)" }
