* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2011-06-27 19:27 Luca Barbato (lu_zero)
0 siblings, 0 replies; 41+ messages in thread
From: Luca Barbato (lu_zero) @ 2011-06-27 19:27 UTC (permalink / raw
To: gentoo-commits
lu_zero 11/06/27 19:27:45
Modified: ChangeLog
Added: qemu-9999.ebuild
Log:
Introduce live ebuild, useful for static qemu-user deployment
(Portage version: 2.1.10.3/cvs/Linux x86_64)
Revision Changes Path
1.86 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.86&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.86&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.85&r2=1.86
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- ChangeLog 24 Mar 2011 19:50:14 -0000 1.85
+++ ChangeLog 27 Jun 2011 19:27:45 -0000 1.86
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.85 2011/03/24 19:50:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.86 2011/06/27 19:27:45 lu_zero Exp $
+
+*qemu-9999 (27 Jun 2011)
+
+ 27 Jun 2011; Luca Barbato <lu_zero@gentoo.org> +qemu-9999.ebuild:
+ Introduce live ebuild, useful for static qemu-user deployment
24 Mar 2011; Christoph Mende <angelos@gentoo.org> qemu-0.11.1.ebuild:
Stable on amd64 wrt bug #356685
1.1 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.1&content-type=text/plain
Index: qemu-9999.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.1 2011/06/27 19:27:45 lu_zero Exp $
EAPI="2"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
GIT_ECLASS="git"
fi
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
if [[ ${PV} = *9999* ]]; then
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://download.savannah.gnu.org/releases/qemu/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU emulator and ABI wrapper"
HOMEPAGE="http://www.qemu.org"
LICENSE="GPL-2"
SLOT="0"
# xen is disabled until the deps are fixed
IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
png pulseaudio qemu-ifup sasl sdl ssl static vde"
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} +qemu_softmmu_targets_${target}"
done
for target in ${IUSE_USER_TARGETS}; do
IUSE="${IUSE} +qemu_user_targets_${target}"
done
RESTRICT="test"
RDEPEND="
!app-emulation/qemu-kvm
!app-emulation/qemu-softmmu
!app-emulation/qemu-user
!app-emulation/qemu-kvm-spice
sys-apps/pciutils
>=sys-apps/util-linux-2.16.0
sys-libs/zlib
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
curl? ( net-misc/curl )
esd? ( media-sound/esound )
fdt? ( >=sys-apps/dtc-1.2.0 )
jpeg? ( virtual/jpeg )
ncurses? ( sys-libs/ncurses )
png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
ssl? ( net-libs/gnutls )
vde? ( net-misc/vde )
"
DEPEND="${RDEPEND}
app-text/texi2html
>=sys-kernel/linux-headers-2.6.29
ssl? ( dev-util/pkgconfig )
"
pkg_setup() {
use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
}
src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
# append CFLAGS while linking
sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
}
src_configure() {
local conf_opts audio_opts user_targets
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && \
softmmu_targets="${softmmu_targets} ${target}-softmmu"
done
for target in ${IUSE_USER_TARGETS} ; do
use "qemu_user_targets_${target}" && \
user_targets="${user_targets} ${target}-linux-user"
done
if [ -z "${softmmu_targets}" ]; then
conf_opts="${conf_opts} --disable-system"
else
einfo "Building the following softmmu targets: ${softmmu_targets}"
fi
if [ ! -z "${user_targets}" ]; then
einfo "Building the following user targets: ${user_targets}"
conf_opts="${conf_opts} --enable-linux-user"
else
conf_opts="${conf_opts} --disable-linux-user"
fi
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
# Add support for static builds
use static && conf_opts="${conf_opts} --static"
# Fix the $(prefix)/etc issue
conf_opts="${conf_opts} --sysconfdir=/etc"
#config options
conf_opts="${conf_opts} $(use_enable aio linux-aio)"
conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
conf_opts="${conf_opts} $(use_enable brltty brlapi)"
conf_opts="${conf_opts} $(use_enable curl)"
conf_opts="${conf_opts} $(use_enable fdt)"
conf_opts="${conf_opts} $(use_enable hardened user-pie)"
conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
conf_opts="${conf_opts} $(use_enable ncurses curses)"
conf_opts="${conf_opts} $(use_enable png vnc-png)"
conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
conf_opts="${conf_opts} $(use_enable sdl)"
conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
conf_opts="${conf_opts} $(use_enable vde)"
conf_opts="${conf_opts} --disable-xen"
conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
# audio options
audio_opts="oss"
use alsa && audio_opts="alsa ${audio_opts}"
use esd && audio_opts="esd ${audio_opts}"
use pulseaudio && audio_opts="pa ${audio_opts}"
use sdl && audio_opts="sdl ${audio_opts}"
./configure --prefix=/usr \
--disable-strip \
--disable-werror \
--disable-kvm \
--enable-nptl \
--enable-uuid \
${conf_opts} \
--audio-drv-list="${audio_opts}" \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
|| die "configure failed"
# this is for qemu upstream's threaded support which is
# in development and broken
# the kvm project has its own support for threaded IO
# which is always on and works
# --enable-io-thread \
}
src_compile() {
# Restricting parallel build until we get a patch to fix this
emake || die
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
if [ ! -z "${softmmu_targets}" ]; then
exeinto /etc/qemu
use qemu-ifup && { doexe \
"${FILESDIR}/qemu-ifup" \
"${FILESDIR}/qemu-ifdown" \
|| die "qemu interface scripts missing" ; }
fi
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
newdoc pc-bios/README README.pc-bios || die
dohtml qemu-doc.html qemu-tech.html || die
}
pkg_postinst() {
use qemu-ifup || return
elog "You will need the Universal TUN/TAP driver compiled into your"
elog "kernel or loaded as a module to use the virtual network device"
elog "if using -net tap. You will also need support for 802.1d"
elog "Ethernet Bridging and a configured bridge if using the provided"
elog "qemu-ifup script from /etc/qemu."
echo
}
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2011-09-20 22:34 Michal Gorny (mgorny)
0 siblings, 0 replies; 41+ messages in thread
From: Michal Gorny (mgorny) @ 2011-09-20 22:34 UTC (permalink / raw
To: gentoo-commits
mgorny 11/09/20 22:34:02
Modified: qemu-9999.ebuild ChangeLog
Log:
Migrate to git-2.
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64)
Revision Changes Path
1.2 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.1&r2=1.2
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- qemu-9999.ebuild 27 Jun 2011 19:27:45 -0000 1.1
+++ qemu-9999.ebuild 20 Sep 2011 22:34:01 -0000 1.2
@@ -1,12 +1,13 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.1 2011/06/27 19:27:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.2 2011/09/20 22:34:01 mgorny Exp $
EAPI="2"
if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git"
- GIT_ECLASS="git"
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git
+ http://git.qemu.org/git/qemu.git"
+ GIT_ECLASS="git-2"
fi
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
1.87 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.87&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.87&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.86&r2=1.87
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- ChangeLog 27 Jun 2011 19:27:45 -0000 1.86
+++ ChangeLog 20 Sep 2011 22:34:01 -0000 1.87
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.86 2011/06/27 19:27:45 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.87 2011/09/20 22:34:01 mgorny Exp $
+
+ 20 Sep 2011; Michał Górny <mgorny@gentoo.org> qemu-9999.ebuild:
+ Migrate to git-2.
*qemu-9999 (27 Jun 2011)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-21 12:57 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-21 12:57 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/21 12:57:30
Modified: qemu-9999.ebuild ChangeLog
Log:
Fixed configure failure (follow upstream in renaming --enablble-user-pic to --enable-pic).
Added all missing linux targets except lm32 (needs proper deps and a fix against --as-needed).
Made ./configure params to be shown.
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Revision Changes Path
1.3 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.2&r2=1.3
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-9999.ebuild 20 Sep 2011 22:34:01 -0000 1.2
+++ qemu-9999.ebuild 21 Jan 2012 12:57:30 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.2 2011/09/20 22:34:01 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.3 2012/01/21 12:57:30 slyfox Exp $
EAPI="2"
@@ -29,9 +29,9 @@
IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses \
png pulseaudio qemu-ifup sasl sdl ssl static vde"
-COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb" # dropped lm32
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -130,7 +130,7 @@
conf_opts="${conf_opts} $(use_enable brltty brlapi)"
conf_opts="${conf_opts} $(use_enable curl)"
conf_opts="${conf_opts} $(use_enable fdt)"
- conf_opts="${conf_opts} $(use_enable hardened user-pie)"
+ conf_opts="${conf_opts} $(use_enable hardened pie)"
conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
conf_opts="${conf_opts} $(use_enable ncurses curses)"
conf_opts="${conf_opts} $(use_enable png vnc-png)"
@@ -147,7 +147,8 @@
use esd && audio_opts="esd ${audio_opts}"
use pulseaudio && audio_opts="pa ${audio_opts}"
use sdl && audio_opts="sdl ${audio_opts}"
- ./configure --prefix=/usr \
+
+ set -- --prefix=/usr \
--disable-strip \
--disable-werror \
--disable-kvm \
@@ -157,9 +158,10 @@
--audio-drv-list="${audio_opts}" \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)" \
- || die "configure failed"
+ --host-cc="$(tc-getBUILD_CC)"
+ echo ./configure "$@" # show actual options
+ ./configure "$@" || die "configure failed"
# this is for qemu upstream's threaded support which is
# in development and broken
# the kvm project has its own support for threaded IO
1.88 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.88&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.88&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.87&r2=1.88
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- ChangeLog 20 Sep 2011 22:34:01 -0000 1.87
+++ ChangeLog 21 Jan 2012 12:57:30 -0000 1.88
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/qemu
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.87 2011/09/20 22:34:01 mgorny Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.88 2012/01/21 12:57:30 slyfox Exp $
+
+ 21 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Fixed configure failure (follow upstream in renaming --enablble-user-pic to
+ --enable-pic). Added all missing linux targets except lm32 (needs proper deps
+ and a fix against --as-needed). Made ./configure params to be shown.
20 Sep 2011; Michał Górny <mgorny@gentoo.org> qemu-9999.ebuild:
Migrate to git-2.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-22 12:38 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-22 12:38 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/22 12:38:34
Modified: qemu-9999.ebuild ChangeLog
Log:
Added _all_ emulated audio cards (bug #144894 by Torsten Krah)
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Revision Changes Path
1.7 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.6&r2=1.7
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qemu-9999.ebuild 22 Jan 2012 11:52:57 -0000 1.6
+++ qemu-9999.ebuild 22 Jan 2012 12:38:34 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.6 2012/01/22 11:52:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.7 2012/01/22 12:38:34 slyfox Exp $
EAPI="2"
@@ -207,6 +207,7 @@
--enable-nptl \
--enable-uuid \
${conf_opts} \
+ --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
--audio-drv-list="${audio_opts}" \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
1.92 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.91&r2=1.92
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog 22 Jan 2012 11:52:57 -0000 1.91
+++ ChangeLog 22 Jan 2012 12:38:34 -0000 1.92
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.91 2012/01/22 11:52:57 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.92 2012/01/22 12:38:34 slyfox Exp $
+
+ 22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Added _all_ emulated audio cards (bug #144894 by Torsten Krah)
*qemu-1.0 (22 Jan 2012)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-22 21:03 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-22 21:03 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/22 21:03:52
Modified: qemu-9999.ebuild ChangeLog
Log:
Hide qemu-ppc* binaries from RWX mappings QA check.
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Revision Changes Path
1.9 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.8&r2=1.9
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qemu-9999.ebuild 22 Jan 2012 17:55:03 -0000 1.8
+++ qemu-9999.ebuild 22 Jan 2012 21:03:52 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.8 2012/01/22 17:55:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.9 2012/01/22 21:03:52 slyfox Exp $
EAPI="2"
@@ -106,6 +106,9 @@
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
+ usr/bin/qemu-ppc
+ usr/bin/qemu-ppc64
+ usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
@@ -222,11 +225,6 @@
# --enable-io-thread \
}
-src_compile() {
- # Restricting parallel build until we get a patch to fix this
- emake || die
-}
-
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
1.94 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.93&r2=1.94
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 22 Jan 2012 17:55:03 -0000 1.93
+++ ChangeLog 22 Jan 2012 21:03:52 -0000 1.94
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.93 2012/01/22 17:55:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.94 2012/01/22 21:03:52 slyfox Exp $
+
+ 22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Hide qemu-ppc* binaries from RWX mappings QA check.
22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-1.0.ebuild,
qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-23 19:04 William Hubbs (williamh)
0 siblings, 0 replies; 41+ messages in thread
From: William Hubbs (williamh) @ 2012-01-23 19:04 UTC (permalink / raw
To: gentoo-commits
williamh 12/01/23 19:04:48
Modified: qemu-9999.ebuild ChangeLog
Log:
clean up live ebuild and migrate to eapi 4 (approved by slyfox)
(Portage version: 2.2.0_alpha84/cvs/Linux i686)
Revision Changes Path
1.10 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.9&r2=1.10
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qemu-9999.ebuild 22 Jan 2012 21:03:52 -0000 1.9
+++ qemu-9999.ebuild 23 Jan 2012 19:04:48 -0000 1.10
@@ -1,8 +1,8 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.9 2012/01/22 21:03:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.10 2012/01/23 19:04:48 williamh Exp $
-EAPI="2"
+EAPI=4
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git
@@ -12,10 +12,7 @@
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs
-if [[ ${PV} = *9999* ]]; then
- SRC_URI=""
- KEYWORDS=""
-else
+if [[ ${PV} != *9999* ]]; then
SRC_URI="http://wiki.qemu.org/download/${P}.tar.gz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
@@ -25,8 +22,8 @@
LICENSE="GPL-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss \
-png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde \
+IUSE="+aio alsa bluetooth brltty curl esd fdt hardened jpeg ncurses nss
+png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads vde
+vhost-net xattr xen"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
@@ -173,28 +170,30 @@
conf_opts="${conf_opts} --sysconfdir=/etc"
#config options
- conf_opts="${conf_opts} $(use_enable aio linux-aio)"
- conf_opts="${conf_opts} $(use_enable bluetooth bluez)"
- conf_opts="${conf_opts} $(use_enable brltty brlapi)"
- conf_opts="${conf_opts} $(use_enable curl)"
- conf_opts="${conf_opts} $(use_enable fdt)"
- conf_opts="${conf_opts} $(use_enable hardened pie)"
- conf_opts="${conf_opts} $(use_enable jpeg vnc-jpeg)"
- conf_opts="${conf_opts} $(use_enable ncurses curses)"
- conf_opts="${conf_opts} $(use_enable nss smartcard-nss)"
- conf_opts="${conf_opts} $(use_enable qemu_softmmu_targets_lm32 opengl)" # single opengl user
- conf_opts="${conf_opts} $(use_enable png vnc-png)"
- conf_opts="${conf_opts} $(use_enable rbd)"
- conf_opts="${conf_opts} $(use_enable sasl vnc-sasl)"
- conf_opts="${conf_opts} $(use_enable sdl)"
- conf_opts="${conf_opts} $(use_enable spice)"
- conf_opts="${conf_opts} $(use_enable ssl vnc-tls)"
- conf_opts="${conf_opts} $(use_enable threads vnc-thread)"
- conf_opts="${conf_opts} $(use_enable vde)"
- conf_opts="${conf_opts} $(use_enable vhost-net)"
- conf_opts="${conf_opts} $(use_enable xen)"
- conf_opts="${conf_opts} $(use_enable xattr attr)"
- conf_opts="${conf_opts} --disable-darwin-user --disable-bsd-user"
+ conf_opts="${conf_opts}
+ $(use_enable aio linux-aio)
+ $(use_enable bluetooth bluez)
+ $(use_enable brltty brlapi)
+ $(use_enable curl)
+ $(use_enable fdt)
+ $(use_enable hardened pie)
+ $(use_enable jpeg vnc-jpeg)
+ $(use_enable ncurses curses)
+ $(use_enable nss smartcard-nss)
+ $(use_enable qemu_softmmu_targets_lm32 opengl)" # single opengl user
+ conf_opts="${conf_opts}
+ $(use_enable png vnc-png)
+ $(use_enable rbd)
+ $(use_enable sasl vnc-sasl)
+ $(use_enable sdl)
+ $(use_enable spice)
+ $(use_enable ssl vnc-tls)
+ $(use_enable threads vnc-thread)
+ $(use_enable vde)
+ $(use_enable vhost-net)
+ $(use_enable xen)
+ $(use_enable xattr attr)
+ --disable-darwin-user --disable-bsd-user"
# audio options
audio_opts="oss"
1.96 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.95&r2=1.96
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog 22 Jan 2012 21:08:40 -0000 1.95
+++ ChangeLog 23 Jan 2012 19:04:48 -0000 1.96
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.95 2012/01/22 21:08:40 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.96 2012/01/23 19:04:48 williamh Exp $
+
+ 23 Jan 2012; William Hubbs <williamh@gentoo.org> qemu-9999.ebuild:
+ clean up live ebuild and migrate to eapi 4 (approved by slyfox)
22 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-1.0.ebuild:
Hide qemu-ppc* binaries from RWX mappings QA check.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-23 21:34 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-23 21:34 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/23 21:34:33
Modified: qemu-9999.ebuild ChangeLog
Log:
Whitespace.
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Revision Changes Path
1.12 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.11&r2=1.12
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- qemu-9999.ebuild 23 Jan 2012 21:15:03 -0000 1.11
+++ qemu-9999.ebuild 23 Jan 2012 21:34:33 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.11 2012/01/23 21:15:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.12 2012/01/23 21:34:33 slyfox Exp $
EAPI=4
@@ -63,18 +63,22 @@
)
png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
+ qemu-ifup? (
+ sys-apps/iproute2
+ net-misc/bridge-utils
+ )
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? ( >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1 )
+ spice? (
+ >=app-emulation/spice-0.9.0
+ >=app-emulation/spice-protocol-0.8.1
+ )
ssl? ( net-libs/gnutls )
usbredir? ( sys-apps/usbredir )
vde? ( net-misc/vde )
xattr? ( sys-apps/attr )
xen? ( app-emulation/xen-tools )
-
"
DEPEND="${RDEPEND}
1.98 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.98&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.98&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.97&r2=1.98
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog 23 Jan 2012 21:15:03 -0000 1.97
+++ ChangeLog 23 Jan 2012 21:34:33 -0000 1.98
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.97 2012/01/23 21:15:03 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.98 2012/01/23 21:34:33 slyfox Exp $
+
+ 23 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Whitespace.
*qemu-1.0-r1 (23 Jan 2012)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-01-29 12:18 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-01-29 12:18 UTC (permalink / raw
To: gentoo-commits
slyfox 12/01/29 12:18:34
Modified: qemu-9999.ebuild ChangeLog
Log:
Respect user's decision whether to generate debug info when build stuff (related to bug #355861 by Andrew Savchenko). Drop outdated seding of Makefiles.
(Portage version: 2.2.0_alpha84_p18/cvs/Linux x86_64)
Revision Changes Path
1.15 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.14&r2=1.15
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qemu-9999.ebuild 27 Jan 2012 21:35:16 -0000 1.14
+++ qemu-9999.ebuild 29 Jan 2012 12:18:34 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.14 2012/01/27 21:35:16 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.15 2012/01/29 12:18:34 slyfox Exp $
EAPI=4
@@ -131,11 +131,11 @@
src_prepare() {
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
- # Alter target makefiles to accept CFLAGS set via flag-o
- sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
- Makefile Makefile.target || die
- # append CFLAGS while linking
- sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
+
+ # drop '-g' by default as it tends to eat
+ # A LOT (~2GB) of ram for each job #355861
+ sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
+ -i configure || die
# Fix underlinking.
# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
1.102 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.101&r2=1.102
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog 28 Jan 2012 11:45:00 -0000 1.101
+++ ChangeLog 29 Jan 2012 12:18:34 -0000 1.102
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.101 2012/01/28 11:45:00 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.102 2012/01/29 12:18:34 slyfox Exp $
+
+ 29 Jan 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-1.0-r2.ebuild,
+ qemu-9999.ebuild:
+ Respect user's decision whether to generate debug info when build stuff
+ (related to bug #355861 by Andrew Savchenko). Drop outdated seding of
+ Makefiles.
*qemu-0.11.1-r1 (28 Jan 2012)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-02-28 18:31 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-02-28 18:31 UTC (permalink / raw
To: gentoo-commits
slyfox 12/02/28 18:31:06
Modified: qemu-9999.ebuild ChangeLog
Log:
Switch to upstream's '--disable-debug-info' to avoid OOM bug #355861.
(Portage version: 2.2.0_alpha89_p3/cvs/Linux x86_64)
Revision Changes Path
1.16 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.15&r2=1.16
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- qemu-9999.ebuild 29 Jan 2012 12:18:34 -0000 1.15
+++ qemu-9999.ebuild 28 Feb 2012 18:31:06 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.15 2012/01/29 12:18:34 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.16 2012/02/28 18:31:06 slyfox Exp $
EAPI=4
@@ -132,11 +132,6 @@
# prevent docs to get automatically installed
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
- # drop '-g' by default as it tends to eat
- # A LOT (~2GB) of ram for each job #355861
- sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
- -i configure || die
-
# Fix underlinking.
# Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
@@ -171,6 +166,10 @@
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+ # drop '-g' by default as it tends to eat
+ # A LOT (~2GB) of ram for each job #355861
+ conf_opts="${conf_opts} --disable-debug-info"
+
# Add support for static builds
use static && conf_opts="${conf_opts} --static"
1.105 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.105&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.105&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.104&r2=1.105
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- ChangeLog 25 Feb 2012 21:03:08 -0000 1.104
+++ ChangeLog 28 Feb 2012 18:31:06 -0000 1.105
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.104 2012/02/25 21:03:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.105 2012/02/28 18:31:06 slyfox Exp $
+
+ 28 Feb 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Switch to upstream's '--disable-debug-info' to avoid OOM bug #355861.
25 Feb 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.0-r3.ebuild:
When building with USE=static, zlib needs to be built with USE=static-libs.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-06-10 20:15 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-06-10 20:15 UTC (permalink / raw
To: gentoo-commits
slyfox 12/06/10 20:15:57
Modified: qemu-9999.ebuild ChangeLog
Log:
Drop '--disable-darwin-user' from configure params. Upstream does not export it anymore.
(Portage version: 2.2.0_alpha110_p5/cvs/Linux x86_64)
Revision Changes Path
1.19 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.18&r2=1.19
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- qemu-9999.ebuild 3 May 2012 18:49:05 -0000 1.18
+++ qemu-9999.ebuild 10 Jun 2012 20:15:57 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.18 2012/05/03 18:49:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.19 2012/06/10 20:15:57 slyfox Exp $
EAPI=4
@@ -196,7 +196,7 @@
$(use_enable xen)
$(use_enable xattr attr)
$(use_enable xfs xfsctl)
- --disable-darwin-user --disable-bsd-user
+ --disable-bsd-user
"
# audio options
1.113 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.113&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.113&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.112&r2=1.113
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- ChangeLog 3 May 2012 18:49:05 -0000 1.112
+++ ChangeLog 10 Jun 2012 20:15:57 -0000 1.113
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.112 2012/05/03 18:49:05 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.113 2012/06/10 20:15:57 slyfox Exp $
+
+ 10 Jun 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Drop '--disable-darwin-user' from configure params. Upstream does not export
+ it anymore.
03 May 2012; Jeff Horelick <jdhore@gentoo.org> qemu-0.11.1.ebuild,
qemu-0.11.1-r1.ebuild, qemu-1.0-r2.ebuild, qemu-1.0-r3.ebuild,
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-09-07 13:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-09-07 13:35 UTC (permalink / raw
To: gentoo-commits
slyfox 12/09/07 13:35:48
Modified: qemu-9999.ebuild ChangeLog
Log:
Fixed configure failure (upstream got rid of '--enabke-vnc-thread' option). Added new or32 target (OpenRISC).
(Portage version: 2.2.0_alpha124_p11/cvs/Linux x86_64)
Revision Changes Path
1.21 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.20&r2=1.21
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- qemu-9999.ebuild 18 Aug 2012 18:51:35 -0000 1.20
+++ qemu-9999.ebuild 7 Sep 2012 13:35:48 -0000 1.21
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.20 2012/08/18 18:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.21 2012/09/07 13:35:48 slyfox Exp $
EAPI=4
@@ -26,9 +26,9 @@
opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
+vhost-net xattr xen xfs"
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
for target in ${IUSE_SOFTMMU_TARGETS}; do
IUSE="${IUSE} +qemu_softmmu_targets_${target}"
@@ -90,7 +90,7 @@
# alpha ELF binary. don't let portage mess with it
STRIP_MASK="usr/share/qemu/palcode-clipper"
-QA_PRESTRIPPED="
+QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
@@ -108,6 +108,7 @@
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
@@ -192,7 +193,6 @@
$(use_enable sdl)
$(use_enable spice)
$(use_enable ssl vnc-tls)
- $(use_enable threads vnc-thread)
$(use_enable vde)
$(use_enable vhost-net)
$(use_enable xen)
@@ -215,6 +215,7 @@
--disable-libiscsi \
--enable-nptl \
--enable-uuid \
+ --disable-seccomp \
${conf_opts} \
--audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
--audio-drv-list="${audio_opts}" \
1.116 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.116&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.116&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.115&r2=1.116
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- ChangeLog 18 Aug 2012 18:51:35 -0000 1.115
+++ ChangeLog 7 Sep 2012 13:35:48 -0000 1.116
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.115 2012/08/18 18:51:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.116 2012/09/07 13:35:48 slyfox Exp $
+
+ 07 Sep 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Fixed configure failure (upstream got rid of '--enabke-vnc-thread' option).
+ Added new or32 target (OpenRISC).
*qemu-1.1.1 (18 Aug 2012)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-10-09 20:40 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-10-09 20:40 UTC (permalink / raw
To: gentoo-commits
cardoe 12/10/09 20:40:53
Modified: qemu-9999.ebuild ChangeLog
Log:
Update the live ebuild to qemu-kvm.
(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)
Revision Changes Path
1.22 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.21&r2=1.22
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- qemu-9999.ebuild 7 Sep 2012 13:35:48 -0000 1.21
+++ qemu-9999.ebuild 9 Oct 2012 20:40:53 -0000 1.22
@@ -1,142 +1,208 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.21 2012/09/07 13:35:48 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.22 2012/10/09 20:40:53 cardoe Exp $
-EAPI=4
+EAPI="4"
-if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.qemu.org/qemu.git
- http://git.qemu.org/git/qemu.git"
- GIT_ECLASS="git-2"
-fi
+MY_PN="qemu-kvm"
+MY_P=${MY_PN}-${PV}
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs python
+PYTHON_DEPEND="2"
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
+#BACKPORTS=1
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="http://wiki.qemu.org/download/${P}.tar.bz2"
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+if [[ ${PV} = *9999* ]]; then
+ EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+ inherit git-2
+ SRC_URI=""
+ KEYWORDS=""
+else
+ SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
+ ${BACKPORTS:+
+ http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-bp-${BACKPORTS}.tar.xz}"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
-DESCRIPTION="QEMU emulator and ABI wrapper"
-HOMEPAGE="http://www.qemu.org"
+DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
+HOMEPAGE="http://www.linux-kvm.org"
-LICENSE="GPL-2"
+LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty curl fdt hardened jpeg kvm ncurses nss
-opengl png pulseaudio qemu-ifup rbd sasl sdl spice ssl static threads usbredir vde
-+vhost-net xattr xen xfs"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt kernel_linux \
+kernel_FreeBSD mixemu ncurses opengl pulseaudio python rbd sasl sdl \
+smartcard spice static systemtap tci tls usbredir vde +vhost-net \
+virtfs xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
+# Setup the default SoftMMU targets, while using the loops
+# below to setup the other targets. x86_64 should be the only
+# defaults on for qemu-kvm
+IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
+REQUIRED_USE="|| ( qemu_softmmu_targets_x86_64"
+
for target in ${IUSE_SOFTMMU_TARGETS}; do
- IUSE="${IUSE} +qemu_softmmu_targets_${target}"
+ if [ "x${target}" = "xx86_64" ]; then
+ continue
+ fi
+ IUSE="${IUSE} qemu_softmmu_targets_${target}"
+ REQUIRED_USE="${REQUIRED_USE} qemu_softmmu_targets_${target}"
done
+REQUIRED_USE="${REQUIRED_USE} )"
for target in ${IUSE_USER_TARGETS}; do
- IUSE="${IUSE} +qemu_user_targets_${target}"
+ IUSE="${IUSE} qemu_user_targets_${target}"
done
-RESTRICT="test"
+REQUIRED_USE="${REQUIRED_USE}
+ static? ( !alsa !pulseaudio )
+ amd64? ( qemu_softmmu_targets_x86_64 )
+ x86? ( qemu_softmmu_targets_x86_64 )
+ virtfs? ( xattr )"
+# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
RDEPEND="
- !app-emulation/qemu-kvm
- !app-emulation/qemu-user
+ !app-emulation/kqemu
+ !app-emulation/qemu
+ !<app-emulation/qemu-1.0
>=dev-libs/glib-2.0
+ media-libs/libpng
sys-apps/pciutils
- >=sys-apps/util-linux-2.16.0
- sys-libs/zlib
+ sys-firmware/ipxe
+ >=sys-firmware/seabios-1.7.0
+ sys-firmware/sgabios
+ sys-firmware/vgabios
+ virtual/jpeg
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
- curl? ( net-misc/curl )
+ caps? ( sys-libs/libcap-ng )
+ curl? ( >=net-misc/curl-7.15.4 )
fdt? ( >=sys-apps/dtc-1.2.0 )
- jpeg? ( virtual/jpeg )
+ kernel_linux? ( >=sys-apps/util-linux-2.16.0 )
ncurses? ( sys-libs/ncurses )
- nss? ( dev-libs/nss )
- opengl? (
- virtual/opengl
- x11-libs/libX11
- )
- png? ( media-libs/libpng )
+ opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
- qemu-ifup? (
- sys-apps/iproute2
- net-misc/bridge-utils
- )
+ python? ( =dev-lang/python-2*[ncurses] )
rbd? ( sys-cluster/ceph )
sasl? ( dev-libs/cyrus-sasl )
- sdl? ( >=media-libs/libsdl-1.2.11[X] )
- spice? (
- >=app-emulation/spice-0.9.0
- >=app-emulation/spice-protocol-0.8.1
+ sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
+ !static? ( >=media-libs/libsdl-1.2.11[X] ) )
+ static? ( sys-libs/zlib[static-libs(+)] )
+ !static? ( sys-libs/zlib )
+ smartcard? ( dev-libs/nss )
+ spice? ( >=app-emulation/spice-protocol-0.8.1
+ static? ( >=app-emulation/spice-0.9.0[static-libs] )
+ !static? ( >=app-emulation/spice-0.9.0 )
)
- ssl? ( net-libs/gnutls )
+ systemtap? ( dev-util/systemtap )
+ tls? ( net-libs/gnutls )
usbredir? ( sys-apps/usbredir )
vde? ( net-misc/vde )
+ virtfs? ( sys-libs/libcap )
xattr? ( sys-apps/attr )
xen? ( app-emulation/xen-tools )
- xfs? ( sys-fs/xfsprogs )
-"
+ xfs? ( sys-fs/xfsprogs )"
DEPEND="${RDEPEND}
app-text/texi2html
virtual/pkgconfig
- >=sys-kernel/linux-headers-2.6.35
-"
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )"
-# alpha ELF binary. don't let portage mess with it
-STRIP_MASK="usr/share/qemu/palcode-clipper"
+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
-"
-# keep sorted
+ usr/share/qemu/palcode-clipper"
+
QA_WX_LOAD="${QA_PRESTRIPPED}
+ usr/bin/qemu-i386
+ usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
- usr/bin/qemu-armeb
usr/bin/qemu-cris
- usr/bin/qemu-i386
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-sparc32plus
usr/bin/qemu-sparc64
- usr/bin/qemu-s390x
- usr/bin/qemu-unicore32
- usr/bin/qemu-x86_64
-"
+ usr/bin/qemu-armeb
+ usr/bin/qemu-sparc32plus"
-pkg_setup() {
- use qemu_softmmu_targets_x86_64 || ewarn "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
+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 && CHECK_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"
- use kvm && ewarn "You have enabled USE=kvm feature. Please consider using app-emulation/qemu-kvm"
+ # Now do the actual checks setup above
+ check_extra_config
+ fi
+ fi
+
+ if use static; then
+ ewarn "USE=static is very much a moving target because of the packages"
+ ewarn "we depend on will have their static libs ripped out or wrapped"
+ ewarn "with USE=static-libs or USE=static due to continued dicsussion"
+ ewarn "on the mailing list about USE=static's place in Gentoo. As a"
+ ewarn "result what worked today may not work tomorrow."
+ fi
+}
+pkg_setup() {
python_set_active_version 2
+ python_pkg_setup
+
+ enewgroup kvm 78
}
src_prepare() {
- # prevent docs to get automatically installed
- sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
+ # Alter target makefiles to accept CFLAGS set via flag-o
+ sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
+ Makefile Makefile.target || die
+
+ python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
+
+ epatch "${FILESDIR}"/${P}-fix-mipsen.patch
+ [[ -n ${BACKPORTS} ]] && \
+ EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
+ epatch
- # Fix underlinking.
- # Fault reproducer: USE=nss QEMU_SOFTMMU_TARGETS=lm32 QEMU_USER_TARGETS=
- sed -i 's/opengl_libs="-lGL"/opengl_libs="-lGL -lX11"/' configure || die
+ epatch_user
}
src_configure() {
@@ -152,11 +218,7 @@
user_targets="${user_targets} ${target}-linux-user"
done
- if [[ -z ${softmmu_targets} ]]; then
- conf_opts="${conf_opts} --disable-system"
- else
- einfo "Building the following softmmu targets: ${softmmu_targets}"
- fi
+ einfo "Building the following softmmu targets: ${softmmu_targets}"
if [[ -n ${user_targets} ]]; then
einfo "Building the following user targets: ${user_targets}"
@@ -165,89 +227,163 @@
conf_opts="${conf_opts} --disable-linux-user"
fi
- # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
- conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
+ # Add support for SystemTAP
+ use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
- # drop '-g' by default as it tends to eat
- # A LOT (~2GB) of ram for each job #355861
- conf_opts="${conf_opts} --disable-debug-info"
+ # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
+ #conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
# Add support for static builds
- use static && conf_opts="${conf_opts} --static"
+ use static && conf_opts="${conf_opts} --static --disable-pie"
- #config options
- conf_opts="${conf_opts}
- $(use_enable aio linux-aio)
- $(use_enable bluetooth bluez)
- $(use_enable brltty brlapi)
- $(use_enable curl)
- $(use_enable fdt)
- $(use_enable hardened pie)
- $(use_enable jpeg vnc-jpeg)
- $(use_enable ncurses curses)
- $(use_enable nss smartcard-nss)
- $(use_enable opengl)
- $(use_enable png vnc-png)
- $(use_enable rbd)
- $(use_enable sasl vnc-sasl)
- $(use_enable sdl)
- $(use_enable spice)
- $(use_enable ssl vnc-tls)
- $(use_enable vde)
- $(use_enable vhost-net)
- $(use_enable xen)
- $(use_enable xattr attr)
- $(use_enable xfs xfsctl)
- --disable-bsd-user
- "
+ # 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 && gcc-specs-pie; then
+ conf_opts="${conf_opts} --enable-pie"
+ fi
# audio options
audio_opts="oss"
- use alsa && audio_opts="alsa ${audio_opts}"
- use pulseaudio && audio_opts="pa ${audio_opts}"
- use sdl && audio_opts="sdl ${audio_opts}"
-
- set -- --prefix="${EPREFIX}"/usr \
- --sysconfdir="${EPREFIX}"/etc \
+ use alsa && audio_opts="alsa,${audio_opts}"
+ use sdl && audio_opts="sdl,${audio_opts}"
+ use pulseaudio && audio_opts="pa,${audio_opts}"
+ use mixemu && conf_opts="${conf_opts} --enable-mixemu"
+
+ # conditionally making UUID work on Linux only is wrong
+ # but the Gentoo/FreeBSD guys need to figure out what
+ # provides libuuid on their platform
+ # --enable-vnc-thread will go away in 1.2
+ # $(use_enable xen xen-pci-passthrough) for 1.2
+ # $(use_enable debug debug-mon) goes away for 1.2
+ # --disable-seccomp as in-tree seccomp is API incompatible (in-tree
+ # version is ancient)
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --disable-bsd-user \
+ --disable-guest-agent \
+ --disable-libiscsi \
--disable-strip \
--disable-werror \
- $(use_enable kvm) \
- --disable-libiscsi \
- --enable-nptl \
- --enable-uuid \
+ --enable-vnc-jpeg \
+ --enable-vnc-png \
+ --python=python2 \
--disable-seccomp \
- ${conf_opts} \
- --audio-card-list="ac97 es1370 sb16 cs4231a adlib gus hda" \
- --audio-drv-list="${audio_opts}" \
+ $(use_enable aio linux-aio) \
+ $(use_enable bluetooth bluez) \
+ $(use_enable brltty brlapi) \
+ $(use_enable caps cap-ng) \
+ $(use_enable curl) \
+ $(use_enable debug debug-info) \
+ $(use_enable debug debug-tcg) \
+ $(use_enable doc docs) \
+ $(use_enable fdt) \
+ $(use_enable kernel_linux kvm) \
+ $(use_enable kernel_linux nptl) \
+ $(use_enable kernel_linux uuid) \
+ $(use_enable ncurses curses) \
+ $(use_enable opengl) \
+ $(use_enable rbd) \
+ $(use_enable sasl vnc-sasl) \
+ $(use_enable sdl) \
+ $(use_enable smartcard smartcard) \
+ $(use_enable smartcard smartcard-nss) \
+ $(use_enable spice) \
+ $(use_enable tci tcg-interpreter) \
+ $(use_enable tls vnc-tls) \
+ $(use_enable usbredir usb-redir) \
+ $(use_enable vde) \
+ $(use_enable vhost-net) \
+ $(use_enable virtfs) \
+ $(use_enable xattr attr) \
+ $(use_enable xen) \
+ $(use_enable xen xen-pci-passthrough) \
+ $(use_enable xfs xfsctl) \
+ --audio-drv-list=${audio_opts} \
--target-list="${softmmu_targets} ${user_targets}" \
--cc="$(tc-getCC)" \
- --host-cc="$(tc-getBUILD_CC)"
+ --host-cc="$(tc-getBUILD_CC)" \
+ ${conf_opts} \
+ || die "configure failed"
- echo ./configure "$@" # show actual options
- ./configure "$@" || die "configure failed"
+ # FreeBSD's kernel does not support QEMU assigning/grabbing
+ # host USB devices yet
+ use kernel_FreeBSD && \
+ sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
}
src_install() {
- emake DESTDIR="${D}" install || die "make install failed"
+ emake DESTDIR="${ED}" install
if [[ -n ${softmmu_targets} ]]; then
- if use qemu-ifup; then
- exeinto /etc/qemu
- doexe "${FILESDIR}"/qemu-if{up,down}
+ if use kernel_linux; then
+ insinto /lib/udev/rules.d/
+ doins "${FILESDIR}"/65-kvm.rules
+ fi
+
+ if use qemu_softmmu_targets_x86_64 ; then
+ dobin "${FILESDIR}"/qemu-kvm
+ ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
+ ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
+ ewarn "your libvirt configs or other wrappers for ${PN}"
+ else
+ elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
+ elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
fi
fi
dodoc Changelog MAINTAINERS TODO pci-ids.txt
newdoc pc-bios/README README.pc-bios
- dohtml qemu-doc.html qemu-tech.html
+
+ if use doc; then
+ dohtml qemu-doc.html qemu-tech.html || die
+ fi
+
+ use python & dobin scripts/kvm/kvm_stat
+
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${ED}/usr/share/qemu/bios.bin"
+ dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
+
+ # Remove vgabios since we're using the vgabios packaged one
+ 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"
+ 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
+
+ # Remove sgabios since we're using the sgabios packaged one
+ rm "${ED}/usr/share/qemu/sgabios.bin"
+ dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
+
+ # Remove iPXE since we're using the iPXE packaged one
+ rm "${ED}/usr/share/qemu/pxe-*.rom"
+ dosym ../ipxe/808610de.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
}
pkg_postinst() {
- use qemu-ifup || return
- elog "You will need the Universal TUN/TAP driver compiled into your"
- elog "kernel or loaded as a module to use the virtual network device"
- elog "if using -net tap. You will also need support for 802.1d"
- elog "Ethernet Bridging and a configured bridge if using the provided"
- elog "qemu-ifup script from /etc/qemu."
- echo
+ if [[ -n ${softmmu_targets} ]]; then
+ elog "If you don't have kvm compiled into the kernel, make sure you have"
+ elog "the kernel module loaded before running kvm. The easiest way to"
+ elog "ensure that the kernel module is loaded is to load it on boot."
+ elog "For AMD CPUs the module is called 'kvm-amd'"
+ elog "For Intel CPUs the module is called 'kvm-intel'"
+ elog "Please review /etc/conf.d/modules for how to load these"
+ elog
+ elog "Make sure your user is in the 'kvm' group"
+ elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
+ elog
+ elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
+ elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
+ fi
}
1.121 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.120&r2=1.121
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog 9 Oct 2012 20:25:13 -0000 1.120
+++ ChangeLog 9 Oct 2012 20:40:53 -0000 1.121
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.120 2012/10/09 20:25:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.121 2012/10/09 20:40:53 cardoe Exp $
+
+ 09 Oct 2012; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Update the live ebuild to qemu-kvm.
09 Oct 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.1.1-r1.ebuild:
This was stable but repoman didn't want to let me keep it stable after the
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-10-29 11:15 Tiziano Mueller (dev-zero)
0 siblings, 0 replies; 41+ messages in thread
From: Tiziano Mueller (dev-zero) @ 2012-10-29 11:15 UTC (permalink / raw
To: gentoo-commits
dev-zero 12/10/29 11:15:29
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix collision with vscclient in the live ebuild like in the 1.2.0 ebuild.
(Portage version: 2.1.11.20/cvs/Linux x86_64)
Revision Changes Path
1.27 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.26&r2=1.27
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- qemu-9999.ebuild 28 Oct 2012 09:27:24 -0000 1.26
+++ qemu-9999.ebuild 29 Oct 2012 11:15:29 -0000 1.27
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.26 2012/10/28 09:27:24 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.27 2012/10/29 11:15:29 dev-zero Exp $
EAPI="4"
@@ -336,6 +336,9 @@
use python & dobin scripts/kvm/kvm_stat
+ # avoid collision with libcacard
+ use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
+
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
1.136 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.136&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.136&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.135&r2=1.136
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- ChangeLog 28 Oct 2012 18:59:12 -0000 1.135
+++ ChangeLog 29 Oct 2012 11:15:29 -0000 1.136
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.135 2012/10/28 18:59:12 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.136 2012/10/29 11:15:29 dev-zero Exp $
+
+ 29 Oct 2012; Tiziano Müller <dev-zero@gentoo.org> qemu-9999.ebuild:
+ Fix collision with vscclient in the live ebuild like in the 1.2.0 ebuild.
28 Oct 2012; Tiziano Müller <dev-zero@gentoo.org> qemu-1.2.0.ebuild:
Fix some build issues (missing patch and wrong S), avoid collision with
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-11-04 22:00 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-11-04 22:00 UTC (permalink / raw
To: gentoo-commits
cardoe 12/11/04 22:00:17
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix patch name.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Revision Changes Path
1.30 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.29&r2=1.30
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- qemu-9999.ebuild 30 Oct 2012 21:01:35 -0000 1.29
+++ qemu-9999.ebuild 4 Nov 2012 22:00:17 -0000 1.30
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.29 2012/10/30 21:01:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.30 2012/11/04 22:00:17 cardoe Exp $
EAPI="4"
@@ -190,7 +190,7 @@
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
- epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
epatch "${FILESDIR}"/${P}-fix-mipsen.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
1.141 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.141&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.141&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.140&r2=1.141
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -r1.140 -r1.141
--- ChangeLog 3 Nov 2012 09:11:38 -0000 1.140
+++ ChangeLog 4 Nov 2012 22:00:17 -0000 1.141
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.140 2012/11/03 09:11:38 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.141 2012/11/04 22:00:17 cardoe Exp $
+
+ 04 Nov 2012; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Fix patch name.
03 Nov 2012; <ago@gentoo.org> qemu-1.1.2-r2.ebuild:
Stable for amd64, wrt bug #440092
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-11-05 6:42 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-11-05 6:42 UTC (permalink / raw
To: gentoo-commits
slyfox 12/11/05 06:42:54
Modified: qemu-9999.ebuild ChangeLog
Log:
Once againt readd or32 target (OpenRISC). Added nore binaries to RWX exempt list: qemu-{microblazeel,or32,s390x,unicore32}. unicore32 got system target implementation.
(Portage version: 2.2.0_alpha142_p5/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.32 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.31&r2=1.32
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- qemu-9999.ebuild 5 Nov 2012 05:32:44 -0000 1.31
+++ qemu-9999.ebuild 5 Nov 2012 06:42:53 -0000 1.32
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.31 2012/11/05 05:32:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.32 2012/11/05 06:42:53 slyfox Exp $
EAPI="4"
@@ -33,9 +33,9 @@
sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
+vhost-net virtfs +vnc xattr xen xfs"
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64 s390x"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus unicore32"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
# Setup the default SoftMMU targets, while using the loops
# below to setup the other targets.
@@ -121,8 +121,10 @@
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
@@ -131,7 +133,9 @@
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
- usr/bin/qemu-sparc32plus"
+ usr/bin/qemu-s390x
+ usr/bin/qemu-sparc32plus
+ usr/bin/qemu-unicore32"
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
1.143 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.143&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.143&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.142&r2=1.143
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -r1.142 -r1.143
--- ChangeLog 5 Nov 2012 05:32:44 -0000 1.142
+++ ChangeLog 5 Nov 2012 06:42:53 -0000 1.143
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.142 2012/11/05 05:32:44 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.143 2012/11/05 06:42:53 slyfox Exp $
+
+ 05 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Once againt readd or32 target (OpenRISC). Added nore binaries to RWX exempt
+ list: qemu-{microblazeel,or32,s390x,unicore32}. unicore32 got system target
+ implementation.
05 Nov 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.2.0.ebuild,
qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-11-21 20:02 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2012-11-21 20:02 UTC (permalink / raw
To: gentoo-commits
cardoe 12/11/21 20:02:53
Modified: qemu-9999.ebuild ChangeLog
Log:
For 1.3 we're switching to qemu from qemu-kvm which is now merged fully into qemu so adjust the 9999 live ebuild to do that.
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.33 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.32&r2=1.33
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- qemu-9999.ebuild 5 Nov 2012 06:42:53 -0000 1.32
+++ qemu-9999.ebuild 21 Nov 2012 20:02:53 -0000 1.33
@@ -1,25 +1,22 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.32 2012/11/05 06:42:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.33 2012/11/21 20:02:53 cardoe Exp $
EAPI="4"
-MY_PN="qemu-kvm"
-MY_P=${MY_PN}-${PV}
-
PYTHON_DEPEND="2"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user
#BACKPORTS=6cee76f0
if [[ ${PV} = *9999* ]]; then
- EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
+ EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
- SRC_URI="mirror://sourceforge/kvm/${MY_PN}/${MY_P}.tar.gz
+ SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
- http://dev.gentoo.org/~cardoe/distfiles/${MY_P}-${BACKPORTS}.tar.xz}"
+ http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
@@ -103,8 +100,6 @@
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
static? ( ${LIB_DEPEND} )"
-S="${WORKDIR}/${MY_P}"
-
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
1.144 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.144&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.144&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.143&r2=1.144
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- ChangeLog 5 Nov 2012 06:42:53 -0000 1.143
+++ ChangeLog 21 Nov 2012 20:02:53 -0000 1.144
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.143 2012/11/05 06:42:53 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.144 2012/11/21 20:02:53 cardoe Exp $
+
+ 21 Nov 2012; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ For 1.3 we're switching to qemu from qemu-kvm which is now merged fully into
+ qemu so adjust the 9999 live ebuild to do that.
05 Nov 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
Once againt readd or32 target (OpenRISC). Added nore binaries to RWX exempt
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-12-04 10:20 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-12-04 10:20 UTC (permalink / raw
To: gentoo-commits
slyfox 12/12/04 10:20:45
Modified: qemu-9999.ebuild ChangeLog
Log:
Follow upstream bump of minimal spice protocol versions.
(Portage version: 2.2.0_alpha142_p5/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.35 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.34&r2=1.35
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- qemu-9999.ebuild 21 Nov 2012 22:22:35 -0000 1.34
+++ qemu-9999.ebuild 4 Dec 2012 10:20:45 -0000 1.35
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.34 2012/11/21 22:22:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $
EAPI="4"
@@ -68,7 +68,7 @@
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-1.0.0[static-libs(+)] )
- spice? ( >=app-emulation/spice-0.9.0[static-libs(+)] )
+ spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
@@ -88,7 +88,7 @@
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss )
- spice? ( >=app-emulation/spice-protocol-0.8.1 )
+ spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.3.4 )
virtfs? ( sys-libs/libcap )
1.150 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.150&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.150&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.149&r2=1.150
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- ChangeLog 21 Nov 2012 22:22:35 -0000 1.149
+++ ChangeLog 4 Dec 2012 10:20:45 -0000 1.150
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.149 2012/11/21 22:22:35 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.150 2012/12/04 10:20:45 slyfox Exp $
+
+ 04 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Follow upstream bump of minimal spice protocol versions.
21 Nov 2012; Doug Goldstein <cardoe@gentoo.org> qemu-1.1.1-r1.ebuild,
qemu-1.1.2-r1.ebuild, qemu-1.1.2-r2.ebuild, qemu-1.1.2-r3.ebuild,
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2012-12-05 15:38 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2012-12-05 15:38 UTC (permalink / raw
To: gentoo-commits
slyfox 12/12/05 15:38:28
Modified: qemu-9999.ebuild ChangeLog
Log:
Drop mips patch as fix gone upstream.
(Portage version: 2.2.0_alpha144_p3/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.36 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.36&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.36&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.35&r2=1.36
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- qemu-9999.ebuild 4 Dec 2012 10:20:45 -0000 1.35
+++ qemu-9999.ebuild 5 Dec 2012 15:38:27 -0000 1.36
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.35 2012/12/04 10:20:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.36 2012/12/05 15:38:27 slyfox Exp $
EAPI="4"
@@ -190,7 +190,6 @@
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
- epatch "${FILESDIR}"/${P}-fix-mipsen.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
1.151 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.151&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.151&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.150&r2=1.151
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- ChangeLog 4 Dec 2012 10:20:45 -0000 1.150
+++ ChangeLog 5 Dec 2012 15:38:27 -0000 1.151
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.150 2012/12/04 10:20:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.151 2012/12/05 15:38:27 slyfox Exp $
+
+ 05 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org>
+ -files/qemu-9999-fix-mipsen.patch, qemu-9999.ebuild:
+ Drop mips patch as fix gone upstream.
04 Dec 2012; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
Follow upstream bump of minimal spice protocol versions.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-01-10 21:04 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-01-10 21:04 UTC (permalink / raw
To: gentoo-commits
slyfox 13/01/10 21:04:56
Modified: qemu-9999.ebuild ChangeLog
Log:
Refresh cflags patch by Michal Privoznik and by Tom Wijsman (bug #451178).
(Portage version: 2.2.0_alpha149_p86/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.39 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.38&r2=1.39
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- qemu-9999.ebuild 13 Dec 2012 20:03:31 -0000 1.38
+++ qemu-9999.ebuild 10 Jan 2013 21:04:56 -0000 1.39
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.38 2012/12/13 20:03:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.39 2013/01/10 21:04:56 slyfox Exp $
EAPI="4"
@@ -27,7 +27,7 @@
SLOT="0"
IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
+sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
+vhost-net virtfs +vnc xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
@@ -87,6 +87,7 @@
pulseaudio? ( media-sound/pulseaudio )
python? ( =dev-lang/python-2*[ncurses] )
sdl? ( media-libs/libsdl[X] )
+ selinux? ( sec-policy/selinux-qemu )
smartcard? ( dev-libs/nss )
spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
@@ -189,7 +190,7 @@
python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
- epatch "${FILESDIR}"/qemu-1.2.0-cflags.patch
+ epatch "${FILESDIR}"/${P}-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
1.156 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.156&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.156&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.155&r2=1.156
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -r1.155 -r1.156
--- ChangeLog 4 Jan 2013 16:15:52 -0000 1.155
+++ ChangeLog 10 Jan 2013 21:04:56 -0000 1.156
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.155 2013/01/04 16:15:52 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.156 2013/01/10 21:04:56 slyfox Exp $
+
+ 10 Jan 2013; Sergei Trofimovich <slyfox@gentoo.org>
+ +files/qemu-9999-cflags.patch, qemu-9999.ebuild:
+ Refresh cflags patch by Michal Privoznik and by Tom Wijsman (bug #451178).
03 Jan 2013; Sven Vermeulen <swift@gentoo.org> qemu-1.1.2-r2.ebuild,
qemu-1.1.2-r3.ebuild, qemu-1.2.0.ebuild, qemu-1.2.1.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-01-12 7:36 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-01-12 7:36 UTC (permalink / raw
To: gentoo-commits
cardoe 13/01/12 07:36:56
Modified: qemu-9999.ebuild ChangeLog
Log:
Fixes from qemu-1.2.2 bump. Set usbredir depend to 0.6 and greater since that's what qemu 1.3 and newer need.
(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.41 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.41&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.41&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.40&r2=1.41
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- qemu-9999.ebuild 11 Jan 2013 23:54:15 -0000 1.40
+++ qemu-9999.ebuild 12 Jan 2013 07:36:56 -0000 1.41
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.40 2013/01/11 23:54:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.41 2013/01/12 07:36:56 cardoe Exp $
EAPI="4"
@@ -67,7 +67,7 @@
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-1.0.0[static-libs(+)] )
+ seccomp? ( >=sys-libs/libseccomp-1.0.1[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
@@ -91,7 +91,7 @@
smartcard? ( dev-libs/nss )
spice? ( >=app-emulation/spice-protocol-0.12.2 )
systemtap? ( dev-util/systemtap )
- usbredir? ( >=sys-apps/usbredir-0.3.4 )
+ usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
@@ -195,11 +195,17 @@
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
+ # Fix ld and objcopy being called directly
+ tc-export LD OBJCOPY
+
+ # Verbose builds
+ MAKEOPTS+=" V=1"
+
epatch_user
}
src_configure() {
- local conf_opts audio_opts user_targets
+ local conf_opts audio_opts
for target in ${IUSE_SOFTMMU_TARGETS} ; do
use "qemu_softmmu_targets_${target}" && \
@@ -245,6 +251,7 @@
./configure --prefix=/usr \
--sysconfdir=/etc \
+ --docdir=/usr/share/doc/${PF}/html \
--disable-bsd-user \
--disable-guest-agent \
--disable-libiscsi \
@@ -320,15 +327,15 @@
dodoc Changelog MAINTAINERS TODO pci-ids.txt
newdoc pc-bios/README README.pc-bios
- if use doc; then
- dohtml qemu-doc.html qemu-tech.html || die
- fi
-
use python && dobin scripts/kvm/kvm_stat
# Avoid collision with app-emulation/libcacard
use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
+ # Install binfmt handler init script for user targets
+ [[ -n ${user_targets} ]] && \
+ newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
+
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
1.161 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.160&r2=1.161
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog 12 Jan 2013 04:56:15 -0000 1.160
+++ ChangeLog 12 Jan 2013 07:36:56 -0000 1.161
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.160 2013/01/12 04:56:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.161 2013/01/12 07:36:56 cardoe Exp $
+
+ 12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Fixes from qemu-1.2.2 bump. Set usbredir depend to 0.6 and greater since
+ that's what qemu 1.3 and newer need.
12 Jan 2013; Doug Goldstein <cardoe@gentoo.org> +files/qemu-binfmt.initd,
qemu-1.2.2.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-01-21 15:07 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-01-21 15:07 UTC (permalink / raw
To: gentoo-commits
cardoe 13/01/21 15:07:32
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix build issues identified by Michal Privoznik <miso.privoznik@gmail.com>
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, unsigned Manifest commit)
Revision Changes Path
1.45 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.45&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.45&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.44&r2=1.45
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- qemu-9999.ebuild 14 Jan 2013 23:06:16 -0000 1.44
+++ qemu-9999.ebuild 21 Jan 2013 15:07:32 -0000 1.45
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.44 2013/01/14 23:06:16 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.45 2013/01/21 15:07:32 cardoe Exp $
EAPI="4"
@@ -286,7 +286,6 @@
$(use_enable sasl vnc-sasl) \
$(use_enable sdl) \
$(use_enable seccomp) \
- $(use_enable smartcard smartcard) \
$(use_enable smartcard smartcard-nss) \
$(use_enable spice) \
$(use_enable tci tcg-interpreter) \
@@ -333,7 +332,7 @@
fi
fi
- dodoc Changelog MAINTAINERS TODO pci-ids.txt
+ dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
use python && dobin scripts/kvm/kvm_stat
1.176 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.176&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.176&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.175&r2=1.176
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- ChangeLog 21 Jan 2013 05:40:24 -0000 1.175
+++ ChangeLog 21 Jan 2013 15:07:32 -0000 1.176
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.175 2013/01/21 05:40:24 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.176 2013/01/21 15:07:32 cardoe Exp $
+
+ 21 Jan 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Fix build issues identified by Michal Privoznik <miso.privoznik@gmail.com>
*qemu-1.2.2-r100 (21 Jan 2013)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-02-28 16:07 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-02-28 16:07 UTC (permalink / raw
To: gentoo-commits
cardoe 13/02/28 16:07:36
Modified: qemu-9999.ebuild ChangeLog
Log:
TODO no longer exists in the top level. Items are tracked in the bug tracker now
(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.47 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.47&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.47&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.46&r2=1.47
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- qemu-9999.ebuild 16 Feb 2013 21:37:48 -0000 1.46
+++ qemu-9999.ebuild 28 Feb 2013 16:07:36 -0000 1.47
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.46 2013/02/16 21:37:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.47 2013/02/28 16:07:36 cardoe Exp $
EAPI="4"
@@ -332,7 +332,7 @@
fi
fi
- dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
use python && dobin scripts/kvm/kvm_stat
1.198 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.198&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.198&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.197&r2=1.198
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- ChangeLog 28 Feb 2013 12:16:33 -0000 1.197
+++ ChangeLog 28 Feb 2013 16:07:36 -0000 1.198
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.197 2013/02/28 12:16:33 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.198 2013/02/28 16:07:36 cardoe Exp $
+
+ 28 Feb 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ TODO no longer exists in the top level. Items are tracked in the bug tracker
+ now
28 Feb 2013; Tiziano Müller <dev-zero@gentoo.org> qemu-1.4.0.ebuild:
Block libcacard since qemu is libcacard upstream and bundles/installs it from
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-03-28 2:06 Stephen Klimaszewski (steev)
0 siblings, 0 replies; 41+ messages in thread
From: Stephen Klimaszewski (steev) @ 2013-03-28 2:06 UTC (permalink / raw
To: gentoo-commits
steev 13/03/28 02:06:23
Modified: qemu-9999.ebuild ChangeLog
Log:
Upstream has changed the qemu configure script, change requested by Cardoe via email
(Portage version: 2.1.11.59/cvs/Linux x86_64, signed Manifest commit with key FDAA957E)
Revision Changes Path
1.48 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.48&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.48&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.47&r2=1.48
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- qemu-9999.ebuild 28 Feb 2013 16:07:36 -0000 1.47
+++ qemu-9999.ebuild 28 Mar 2013 02:06:23 -0000 1.48
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.47 2013/02/28 16:07:36 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.48 2013/03/28 02:06:23 steev Exp $
EAPI="4"
@@ -280,7 +280,7 @@
$(use_enable kernel_linux kvm) \
$(use_enable kernel_linux nptl) \
$(use_enable ncurses curses) \
- $(use_enable opengl) \
+ $(use_enable opengl glx) \
$(use_enable png vnc-png) \
$(use_enable rbd) \
$(use_enable sasl vnc-sasl) \
1.204 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.204&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.204&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.203&r2=1.204
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- ChangeLog 19 Mar 2013 17:34:57 -0000 1.203
+++ ChangeLog 28 Mar 2013 02:06:23 -0000 1.204
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.203 2013/03/19 17:34:57 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.204 2013/03/28 02:06:23 steev Exp $
+
+ 28 Mar 2013; Steev Klimaszewski <steev@gentoo.org> qemu-9999.ebuild:
+ Upstream has changed the qemu configure script, change requested by Cardoe
+ via email
19 Mar 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.4.0-r1.ebuild:
Always ensure the check-report is generated. fixes bug #462010
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-05-30 15:56 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-05-30 15:56 UTC (permalink / raw
To: gentoo-commits
cardoe 13/05/30 15:56:30
Modified: qemu-9999.ebuild ChangeLog
Log:
Updates to the live ebuild
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.50 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.49&r2=1.50
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- qemu-9999.ebuild 7 May 2013 15:56:29 -0000 1.49
+++ qemu-9999.ebuild 30 May 2013 15:56:30 -0000 1.50
@@ -1,12 +1,16 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.49 2013/05/07 15:56:29 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.50 2013/05/30 15:56:30 cardoe Exp $
-EAPI="4"
+EAPI=5
-PYTHON_DEPEND="2"
-inherit eutils flag-o-matic linux-info toolchain-funcs multilib python user udev
-#BACKPORTS=6cee76f0
+PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_REQ_USE="ncurses,readline"
+
+inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
+ user udev fcaps
+
+BACKPORTS=6b5934f9
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
@@ -25,12 +29,14 @@
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
-IUSE="+aio alsa bluetooth brltty +caps +curl debug doc fdt +jpeg kernel_linux \
-kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python rbd sasl +seccomp \
-sdl selinux smartcard spice static systemtap tci +threads tls usbredir +uuid vde \
-+vhost-net virtfs +vnc xattr xen xfs"
+IUSE="+aio alsa bluetooth brltty +caps +curl debug fdt iscsi +jpeg \
+kernel_linux kernel_FreeBSD mixemu ncurses opengl +png pulseaudio python \
+rbd sasl +seccomp sdl selinux smartcard spice static static-softmmu \
+static-user systemtap tci test +threads tls usbredir +uuid vde +vhost-net \
+virtfs +vnc xattr xen xfs"
-COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
+mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
@@ -50,13 +56,16 @@
# Block USE flag configurations known to not work
REQUIRED_USE="${REQUIRED_USE}
- static? ( !alsa !pulseaudio !bluetooth !opengl )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ static? ( static-softmmu static-user )
+ static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-apps/pciutils[static-libs(+)]
sys-libs/zlib[static-libs(+)]
+ >=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(+)] )
@@ -74,40 +83,46 @@
vde? ( net-misc/vde[static-libs(+)] )
xattr? ( sys-apps/attr[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+RDEPEND="!static-softmmu? ( ${LIB_DEPEND//\[static-libs(+)]} )
!app-emulation/kqemu
qemu_softmmu_targets_i386? (
sys-firmware/ipxe
- >=sys-firmware/seabios-1.7.0
+ sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)
qemu_softmmu_targets_x86_64? (
sys-firmware/ipxe
- >=sys-firmware/seabios-1.7.0
+ sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
+ iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
- python? ( =dev-lang/python-2*[ncurses] )
+ python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
selinux? ( sec-policy/selinux-qemu )
- smartcard? ( dev-libs/nss )
- spice? ( >=app-emulation/spice-protocol-0.12.2 )
+ 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}
+ app-text/texi2html
+ =dev-lang/python-2*
virtual/pkgconfig
- doc? ( app-text/texi2html )
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
- static? ( ${LIB_DEPEND} )"
+ static-softmmu? ( ${LIB_DEPEND} )
+ test? (
+ dev-libs/glib[utils]
+ sys-devel/bc
+ )"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
@@ -117,8 +132,7 @@
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper"
-QA_WX_LOAD="${QA_PRESTRIPPED}
- usr/bin/qemu-i386
+QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
@@ -141,6 +155,16 @@
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
+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."
@@ -174,21 +198,12 @@
check_extra_config
fi
fi
-
- if use static; then
- ewarn "USE=static is very much a moving target because of the packages"
- ewarn "we depend on will have their static libs ripped out or wrapped"
- ewarn "with USE=static-libs or USE=static due to continued dicsussion"
- ewarn "on the mailing list about USE=static's place in Gentoo. As a"
- ewarn "result what worked today may not work tomorrow."
- fi
}
pkg_setup() {
- python_set_active_version 2
- python_pkg_setup
-
enewgroup kvm 78
+
+ python_export_best
}
src_prepare() {
@@ -196,10 +211,7 @@
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
- python_convert_shebangs -r 2 "${S}/scripts/kvm/kvm_stat"
- python_convert_shebangs -r 2 "${S}/scripts/kvm/vmxcap"
-
- epatch "${FILESDIR}"/${P}-cflags.patch
+ epatch "${FILESDIR}"/qemu-9999-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
@@ -213,95 +225,112 @@
epatch_user
}
-src_configure() {
+##
+# 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 conf_opts audio_opts
+ local static_flag="static-${buildtype}"
- for target in ${IUSE_SOFTMMU_TARGETS} ; do
- use "qemu_softmmu_targets_${target}" && \
- softmmu_targets="${softmmu_targets} ${target}-softmmu"
- done
+ conf_opts="--prefix=/usr"
+ conf_opts+=" --sysconfdir=/etc"
+ conf_opts+=" --libdir=/usr/$(get_libdir)"
+ conf_opts+=" --docdir=/usr/share/doc/${PF}/html"
+ conf_opts+=" --disable-bsd-user"
+ conf_opts+=" --disable-guest-agent"
+ conf_opts+=" --disable-strip"
+ conf_opts+=" --disable-werror"
+ conf_opts+=" --python=${PYTHON}"
- for target in ${IUSE_USER_TARGETS} ; do
- use "qemu_user_targets_${target}" && \
- user_targets="${user_targets} ${target}-linux-user"
- done
+ # audio options
+ audio_opts="oss"
+ use alsa && audio_opts="alsa,${audio_opts}"
+ use sdl && audio_opts="sdl,${audio_opts}"
+ use pulseaudio && audio_opts="pa,${audio_opts}"
- einfo "Building the following softmmu targets: ${softmmu_targets}"
+ if [[ ${buildtype} == "user" ]]; then
+ conf_opts+=" --enable-linux-user"
+ conf_opts+=" --disable-system"
+ conf_opts+=" --target-list=${user_targets}"
+ conf_opts+=" --disable-blobs"
+ conf_opts+=" --disable-bluez"
+ conf_opts+=" --disable-curses"
+ conf_opts+=" --disable-kvm"
+ conf_opts+=" --disable-libiscsi"
+ conf_opts+=" $(use_enable seccomp)"
+ conf_opts+=" --disable-sdl"
+ conf_opts+=" --disable-smartcard-nss"
+ conf_opts+=" --disable-tools"
+ conf_opts+=" --disable-vde"
+ fi
- if [[ -n ${user_targets} ]]; then
- einfo "Building the following user targets: ${user_targets}"
- conf_opts="${conf_opts} --enable-linux-user"
- else
- conf_opts="${conf_opts} --disable-linux-user"
+ if [[ ${buildtype} == "softmmu" ]]; then
+ conf_opts+=" --disable-linux-user"
+ conf_opts+=" --enable-system"
+ conf_opts+=" --with-system-pixman"
+ conf_opts+=" --target-list=${softmmu_targets}"
+ conf_opts+=" $(use_enable bluetooth bluez)"
+ conf_opts+=" $(use_enable sdl)"
+ conf_opts+=" $(use_enable aio linux-aio)"
+ conf_opts+=" $(use_enable brltty brlapi)"
+ conf_opts+=" $(use_enable caps cap-ng)"
+ conf_opts+=" $(use_enable curl)"
+ conf_opts+=" $(use_enable fdt)"
+ conf_opts+=" $(use_enable iscsi libiscsi)"
+ conf_opts+=" $(use_enable jpeg vnc-jpeg)"
+ conf_opts+=" $(use_enable kernel_linux kvm)"
+ conf_opts+=" $(use_enable kernel_linux nptl)"
+ conf_opts+=" $(use_enable ncurses curses)"
+ conf_opts+=" $(use_enable opengl)"
+ conf_opts+=" $(use_enable png vnc-png)"
+ conf_opts+=" $(use_enable rbd)"
+ conf_opts+=" $(use_enable sasl vnc-sasl)"
+ conf_opts+=" $(use_enable seccomp)"
+ conf_opts+=" $(use_enable smartcard smartcard-nss)"
+ conf_opts+=" $(use_enable spice)"
+ conf_opts+=" $(use_enable tls vnc-tls)"
+ conf_opts+=" $(use_enable tls vnc-ws)"
+ conf_opts+=" $(use_enable usbredir usb-redir)"
+ conf_opts+=" $(use_enable uuid)"
+ conf_opts+=" $(use_enable vde)"
+ conf_opts+=" $(use_enable vhost-net)"
+ conf_opts+=" $(use_enable virtfs)"
+ conf_opts+=" $(use_enable vnc)"
+ conf_opts+=" $(use_enable xattr attr)"
+ conf_opts+=" $(use_enable xen)"
+ conf_opts+=" $(use_enable xen xen-pci-passthrough)"
+ conf_opts+=" $(use_enable xfs xfsctl)"
+ use mixemu && conf_opts+=" --enable-mixemu"
+ conf_opts+=" --audio-drv-list=${audio_opts}"
+ #conf_opts+=" --enable-migration-from-qemu-kvm"
fi
+ conf_opts+=" $(use_enable debug debug-info)"
+ conf_opts+=" $(use_enable debug debug-tcg)"
+ conf_opts+=" --enable-docs"
+ conf_opts+=" $(use_enable tci tcg-interpreter)"
+
# Add support for SystemTAP
use systemtap && conf_opts="${conf_opts} --enable-trace-backend=dtrace"
- # Fix QA issues. QEMU needs executable heaps and we need to mark it as such
- #conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
-
# Add support for static builds
- use static && conf_opts="${conf_opts} --static --disable-pie"
+ use ${static_flag} && conf_opts="${conf_opts} --static --disable-pie"
# 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 && gcc-specs-pie; then
+ if ! use ${static_flag} && gcc-specs-pie; then
conf_opts="${conf_opts} --enable-pie"
fi
- # audio options
- audio_opts="oss"
- use alsa && audio_opts="alsa,${audio_opts}"
- use sdl && audio_opts="sdl,${audio_opts}"
- use pulseaudio && audio_opts="pa,${audio_opts}"
- use mixemu && conf_opts="${conf_opts} --enable-mixemu"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --docdir=/usr/share/doc/${PF}/html \
- --disable-bsd-user \
- --disable-guest-agent \
- --disable-libiscsi \
- --disable-strip \
- --disable-werror \
- --python=python2 \
- $(use_enable aio linux-aio) \
- $(use_enable bluetooth bluez) \
- $(use_enable brltty brlapi) \
- $(use_enable caps cap-ng) \
- $(use_enable curl) \
- $(use_enable debug debug-info) \
- $(use_enable debug debug-tcg) \
- $(use_enable doc docs) \
- $(use_enable fdt) \
- $(use_enable jpeg vnc-jpeg) \
- $(use_enable kernel_linux kvm) \
- $(use_enable kernel_linux nptl) \
- $(use_enable ncurses curses) \
- $(use_enable opengl glx) \
- $(use_enable png vnc-png) \
- $(use_enable rbd) \
- $(use_enable sasl vnc-sasl) \
- $(use_enable sdl) \
- $(use_enable seccomp) \
- $(use_enable smartcard smartcard-nss) \
- $(use_enable spice) \
- $(use_enable tci tcg-interpreter) \
- $(use_enable tls vnc-tls) \
- $(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} \
- --target-list="${softmmu_targets} ${user_targets}" \
+ einfo "./configure ${conf_opts}"
+ cd ${builddir}
+ ../configure \
--cc="$(tc-getCC)" \
--host-cc="$(tc-getBUILD_CC)" \
${conf_opts} \
@@ -313,37 +342,111 @@
sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak
}
+src_configure() {
+ softmmu_targets=
+ user_targets=
+
+ for target in ${IUSE_SOFTMMU_TARGETS} ; do
+ use "qemu_softmmu_targets_${target}" && \
+ softmmu_targets="${softmmu_targets},${target}-softmmu"
+ done
+
+ for target in ${IUSE_USER_TARGETS} ; do
+ use "qemu_user_targets_${target}" && \
+ user_targets="${user_targets},${target}-linux-user"
+ 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() {
+ cd "${S}/softmmu-build"
+ emake -j1 check
+ emake -j1 check-report.html
+}
+
+qemu_python_install() {
+ python_domodule "${S}/QMP/qmp.py"
+
+ python_doscript "${S}/scripts/kvm/kvm_stat"
+ python_doscript "${S}/scripts/kvm/vmxcap"
+ python_doscript "${S}/QMP/qmp-shell"
+ python_doscript "${S}/QMP/qemu-ga-client"
+}
+
src_install() {
- emake DESTDIR="${ED}" 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
+
+ if use test; then
+ dohtml check-report.html
+ fi
+
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use qemu_softmmu_targets_x86_64 ; then
- dosym /usr/bin/qemu-system-x86_64 /usr/bin/qemu-kvm
+ newbin "${FILESDIR}/qemu-kvm-1.4" qemu-kvm
ewarn "The deprecated '/usr/bin/kvm' symlink is no longer installed"
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
ewarn "your libvirt configs or other wrappers for ${PN}"
elif use x86 || use amd64; then
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
- elog "of the /usr/bin/qemu-kvm symlink."
+ elog "of the /usr/bin/qemu-kvm script."
fi
- fi
- dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
- newdoc pc-bios/README README.pc-bios
+ if use python; then
+ python_foreach_impl qemu_python_install
+ fi
+ fi
- use python && dobin scripts/kvm/kvm_stat
- use python && dobin scripts/kvm/vmxcap
+ # Install config file example for qemu-bridge-helper
+ insinto "/etc/qemu"
+ doins "${FILESDIR}/bridge.conf"
- # Avoid collision with app-emulation/libcacard
- use smartcard && mv "${ED}/usr/bin/vscclient" "${ED}/usr/bin/qemu-vscclient"
+ # Remove the docdir placed qmp-commands.txt
+ mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
- # Install binfmt handler init script for user targets
- [[ -n ${user_targets} ]] && \
- newinitd "${FILESDIR}/qemu-binfmt.initd" qemu-binfmt
+ cd "${S}"
+ dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
+ newdoc pc-bios/README README.pc-bios
+ dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
@@ -384,9 +487,9 @@
}
pkg_postinst() {
- 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
+ local virtfs_caps=
+
+ if qemu_support_kvm; then
elog "If you don't have kvm compiled into the kernel, make sure you have"
elog "the kernel module loaded before running kvm. The easiest way to"
elog "ensure that the kernel module is loaded is to load it on boot."
@@ -399,6 +502,25 @@
elog
fi
+ virtfs_caps+="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,"
+ virtfs_caps+="cap_setgid,cap_mknod,cap_setuid"
+
+ fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
+ use virtfs && fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
+
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
}
+
+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)"
+}
1.213 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.213&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.213&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.212&r2=1.213
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- ChangeLog 30 May 2013 15:06:39 -0000 1.212
+++ ChangeLog 30 May 2013 15:56:30 -0000 1.213
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.212 2013/05/30 15:06:39 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.213 2013/05/30 15:56:30 cardoe Exp $
+
+ 30 May 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Updates to the live ebuild
30 May 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.4.2.ebuild:
Add a missing PYTHON_REQUIRED_USE for the conversion to python-r1 eclass.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-05-31 14:20 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-05-31 14:20 UTC (permalink / raw
To: gentoo-commits
slyfox 13/05/31 14:20:45
Modified: qemu-9999.ebuild ChangeLog
Log:
Unbreak live ebuild: tried to apply nonexisting BACKPORTS, --enable-opengl was renamed to --enable-glx.
(Portage version: 2.2.0_alpha170_p3/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.51 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.50&r2=1.51
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- qemu-9999.ebuild 30 May 2013 15:56:30 -0000 1.50
+++ qemu-9999.ebuild 31 May 2013 14:20:45 -0000 1.51
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.50 2013/05/30 15:56:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.51 2013/05/31 14:20:45 slyfox Exp $
EAPI=5
@@ -17,6 +17,7 @@
inherit git-2
SRC_URI=""
KEYWORDS=""
+ BACKPORTS="" # live does not need backporting
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
@@ -286,7 +287,7 @@
conf_opts+=" $(use_enable kernel_linux kvm)"
conf_opts+=" $(use_enable kernel_linux nptl)"
conf_opts+=" $(use_enable ncurses curses)"
- conf_opts+=" $(use_enable opengl)"
+ conf_opts+=" $(use_enable opengl glx)"
conf_opts+=" $(use_enable png vnc-png)"
conf_opts+=" $(use_enable rbd)"
conf_opts+=" $(use_enable sasl vnc-sasl)"
1.214 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.214&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.214&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.213&r2=1.214
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- ChangeLog 30 May 2013 15:56:30 -0000 1.213
+++ ChangeLog 31 May 2013 14:20:45 -0000 1.214
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.213 2013/05/30 15:56:30 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.214 2013/05/31 14:20:45 slyfox Exp $
+
+ 31 May 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Unbreak live ebuild: tried to apply nonexisting BACKPORTS, --enable-opengl was
+ renamed to --enable-glx.
30 May 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
Updates to the live ebuild
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-05-31 15:35 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-05-31 15:35 UTC (permalink / raw
To: gentoo-commits
slyfox 13/05/31 15:35:40
Modified: qemu-9999.ebuild ChangeLog
Log:
Added system target: moxie; user targets: mips64, mips64el, mipsn32, mipsn32el.
(Portage version: 2.2.0_alpha177_p3/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.52 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.52&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.52&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.51&r2=1.52
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- qemu-9999.ebuild 31 May 2013 14:20:45 -0000 1.51
+++ qemu-9999.ebuild 31 May 2013 15:35:40 -0000 1.52
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.51 2013/05/31 14:20:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.52 2013/05/31 15:35:40 slyfox Exp $
EAPI=5
@@ -37,9 +37,9 @@
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="i386 x86_64 alpha arm cris m68k microblaze microblazeel mips
-mipsel or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
-IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 mips64 mips64el ppcemb xtensa xtensaeb"
-IUSE_USER_TARGETS="${COMMON_TARGETS} armeb ppc64abi32 sparc32plus"
+mipsel mips64 mips64el or32 ppc ppc64 sh4 sh4eb sparc sparc64 s390x unicore32"
+IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
+IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
# Setup the default SoftMMU targets, while using the loops
# below to setup the other targets.
@@ -445,7 +445,7 @@
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/QMP/"
cd "${S}"
- dodoc Changelog MAINTAINERS TODO docs/specs/pci-ids.txt
+ dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
dodoc QMP/qmp-commands.txt QMP/qmp-events.txt QMP/qmp-spec.txt
1.215 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.215&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.215&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.214&r2=1.215
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- ChangeLog 31 May 2013 14:20:45 -0000 1.214
+++ ChangeLog 31 May 2013 15:35:40 -0000 1.215
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.214 2013/05/31 14:20:45 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.215 2013/05/31 15:35:40 slyfox Exp $
+
+ 31 May 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Added system target: moxie; user targets: mips64, mips64el, mipsn32,
+ mipsn32el.
31 May 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
Unbreak live ebuild: tried to apply nonexisting BACKPORTS, --enable-opengl was
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-06-22 16:24 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-06-22 16:24 UTC (permalink / raw
To: gentoo-commits
slyfox 13/06/22 16:24:19
Modified: qemu-9999.ebuild ChangeLog
Log:
Adjust 'dtc' depend to require development snapshot. Add 's390-ccw.img' to list of prebuilts.
(Portage version: 2.2.0_alpha182_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.54 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.54&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.54&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.53&r2=1.54
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- qemu-9999.ebuild 20 Jun 2013 23:17:13 -0000 1.53
+++ qemu-9999.ebuild 22 Jun 2013 16:24:19 -0000 1.54
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.53 2013/06/20 23:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.54 2013/06/22 16:24:19 slyfox Exp $
EAPI=5
@@ -63,6 +63,7 @@
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
+# Currently, >=sys-apps/dtc-1.4.0 means -9999 as <libfdt_env.h> appeared only in git tree (after 1.3.0)
LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-apps/pciutils[static-libs(+)]
sys-libs/zlib[static-libs(+)]
@@ -70,7 +71,7 @@
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.2.0[static-libs(+)] )
+ fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
@@ -131,7 +132,8 @@
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
- usr/share/qemu/palcode-clipper"
+ usr/share/qemu/palcode-clipper
+ usr/share/qemu/s390-ccw.img"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
1.219 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.219&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.219&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.218&r2=1.219
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- ChangeLog 20 Jun 2013 23:17:13 -0000 1.218
+++ ChangeLog 22 Jun 2013 16:24:19 -0000 1.219
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.218 2013/06/20 23:17:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.219 2013/06/22 16:24:19 slyfox Exp $
+
+ 22 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Adjust 'dtc' depend to require development snapshot. Add 's390-ccw.img' to
+ list of prebuilts.
20 Jun 2013; Mike Frysinger <vapier@gentoo.org> metadata.xml,
qemu-1.4.2.ebuild, qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-07-26 15:32 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-07-26 15:32 UTC (permalink / raw
To: gentoo-commits
slyfox 13/07/26 15:32:58
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix configure phase. NPTL is not a user-configurable feature anymore.
(Portage version: 2.2.0_alpha189_p3/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.55 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.55&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.55&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.54&r2=1.55
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- qemu-9999.ebuild 22 Jun 2013 16:24:19 -0000 1.54
+++ qemu-9999.ebuild 26 Jul 2013 15:32:58 -0000 1.55
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.54 2013/06/22 16:24:19 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.55 2013/07/26 15:32:58 slyfox Exp $
EAPI=5
@@ -287,7 +287,6 @@
conf_opts+=" $(use_enable iscsi libiscsi)"
conf_opts+=" $(use_enable jpeg vnc-jpeg)"
conf_opts+=" $(use_enable kernel_linux kvm)"
- conf_opts+=" $(use_enable kernel_linux nptl)"
conf_opts+=" $(use_enable ncurses curses)"
conf_opts+=" $(use_enable opengl glx)"
conf_opts+=" $(use_enable png vnc-png)"
1.224 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.224&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.224&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.223&r2=1.224
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- ChangeLog 19 Jul 2013 04:42:15 -0000 1.223
+++ ChangeLog 26 Jul 2013 15:32:58 -0000 1.224
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.223 2013/07/19 04:42:15 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.224 2013/07/26 15:32:58 slyfox Exp $
+
+ 26 Jul 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Fix configure phase. NPTL is not a user-configurable feature anymore.
*qemu-1.5.1 (19 Jul 2013)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-08-04 18:28 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-08-04 18:28 UTC (permalink / raw
To: gentoo-commits
cardoe 13/08/04 18:28:54
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix libseccomp depend for master. bug #479562
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.56 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.56&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.56&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.55&r2=1.56
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- qemu-9999.ebuild 26 Jul 2013 15:32:58 -0000 1.55
+++ qemu-9999.ebuild 4 Aug 2013 18:28:54 -0000 1.56
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.55 2013/07/26 15:32:58 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.56 2013/08/04 18:28:54 cardoe Exp $
EAPI=5
@@ -78,7 +78,7 @@
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-1.0.1[static-libs(+)] )
+ seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
1.230 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.230&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.230&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.229&r2=1.230
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.229
retrieving revision 1.230
diff -u -r1.229 -r1.230
--- ChangeLog 3 Aug 2013 19:47:09 -0000 1.229
+++ ChangeLog 4 Aug 2013 18:28:54 -0000 1.230
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.229 2013/08/03 19:47:09 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.230 2013/08/04 18:28:54 cardoe Exp $
+
+ 04 Aug 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Fix libseccomp depend for master. bug #479562
*qemu-1.5.2-r1 (03 Aug 2013)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-08-17 21:32 Sergei Trofimovich (slyfox)
0 siblings, 0 replies; 41+ messages in thread
From: Sergei Trofimovich (slyfox) @ 2013-08-17 21:32 UTC (permalink / raw
To: gentoo-commits
slyfox 13/08/17 21:32:54
Modified: qemu-9999.ebuild ChangeLog
Log:
Conditionalize '--enable-migration-from-qemu-kvm' (not an upstream option).
(Portage version: 2.2.0_alpha194_p2/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Revision Changes Path
1.58 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.57&r2=1.58
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- qemu-9999.ebuild 16 Aug 2013 14:05:22 -0000 1.57
+++ qemu-9999.ebuild 17 Aug 2013 21:32:54 -0000 1.58
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.57 2013/08/16 14:05:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.58 2013/08/17 21:32:54 slyfox Exp $
EAPI=5
@@ -328,7 +328,8 @@
conf_opts+=" $(use_enable xfs xfsctl)"
use mixemu && conf_opts+=" --enable-mixemu"
conf_opts+=" --audio-drv-list=${audio_opts}"
- conf_opts+=" --enable-migration-from-qemu-kvm"
+ # Gentoo-specific opts
+ [[ ${PV} = *9999* ]] || conf_opts+=" --enable-migration-from-qemu-kvm"
fi
conf_opts+=" $(use_enable debug debug-info)"
1.235 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.235&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.235&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.234&r2=1.235
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- ChangeLog 16 Aug 2013 14:05:22 -0000 1.234
+++ ChangeLog 17 Aug 2013 21:32:54 -0000 1.235
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.234 2013/08/16 14:05:22 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.235 2013/08/17 21:32:54 slyfox Exp $
+
+ 17 Aug 2013; Sergei Trofimovich <slyfox@gentoo.org> qemu-9999.ebuild:
+ Conditionalize '--enable-migration-from-qemu-kvm' (not an upstream option).
*qemu-1.6.0 (16 Aug 2013)
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2013-08-19 14:08 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2013-08-19 14:08 UTC (permalink / raw
To: gentoo-commits
cardoe 13/08/19 14:08:34
Modified: qemu-9999.ebuild ChangeLog
Log:
SeaBIOS/VGABios/sgabios are not meant to be a versioned depend for the live ebuild. bug #481594
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D7DFA8D318FA9AEF!)
Revision Changes Path
1.59 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.59&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.59&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.58&r2=1.59
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- qemu-9999.ebuild 17 Aug 2013 21:32:54 -0000 1.58
+++ qemu-9999.ebuild 19 Aug 2013 14:08:33 -0000 1.59
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.58 2013/08/17 21:32:54 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.59 2013/08/19 14:08:33 cardoe Exp $
EAPI=5
@@ -90,15 +90,15 @@
static-user? ( >=dev-libs/glib-2.0[static-libs(+)] )
qemu_softmmu_targets_i386? (
>=sys-firmware/ipxe-1.0.0_p20130624
- >=sys-firmware/seabios-1.7.3
- >=sys-firmware/sgabios-0.1_pre8
- >=sys-firmware/vgabios-0.7a
+ sys-firmware/seabios
+ sys-firmware/sgabios
+ sys-firmware/vgabios
)
qemu_softmmu_targets_x86_64? (
>=sys-firmware/ipxe-1.0.0_p20130624
- >=sys-firmware/seabios-1.7.3
- >=sys-firmware/sgabios-0.1_pre8
- >=sys-firmware/vgabios-0.7a
+ sys-firmware/seabios
+ sys-firmware/sgabios
+ sys-firmware/vgabios
)
accessibility? ( app-accessibility/brltty )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
1.237 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.237&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.237&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.236&r2=1.237
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -r1.236 -r1.237
--- ChangeLog 19 Aug 2013 14:07:08 -0000 1.236
+++ ChangeLog 19 Aug 2013 14:08:33 -0000 1.237
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.236 2013/08/19 14:07:08 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.237 2013/08/19 14:08:33 cardoe Exp $
+
+ 19 Aug 2013; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ SeaBIOS/VGABios/sgabios are not meant to be a versioned depend for the live
+ ebuild. bug #481594
19 Aug 2013; Doug Goldstein <cardoe@gentoo.org> qemu-1.5.2-r1.ebuild,
qemu-1.5.2-r2.ebuild, qemu-1.6.0.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2014-04-19 17:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2014-04-19 17:41 UTC (permalink / raw
To: gentoo-commits
vapier 14/04/19 17:41:33
Modified: qemu-9999.ebuild ChangeLog
Log:
Fix by Tim Comer for stack overflow in virtfs-proxy-helper #486714.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.65 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.65&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.65&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.64&r2=1.65
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- qemu-9999.ebuild 19 Apr 2014 17:12:38 -0000 1.64
+++ qemu-9999.ebuild 19 Apr 2014 17:41:33 -0000 1.65
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.64 2014/04/19 17:12:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.65 2014/04/19 17:41:33 vapier Exp $
EAPI=5
@@ -235,6 +235,7 @@
Makefile Makefile.target || die
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
+ epatch "${FILESDIR}"/qemu-9999-virtfs-proxy-helper-accept.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
1.252 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.252&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.252&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.251&r2=1.252
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- ChangeLog 19 Apr 2014 17:12:38 -0000 1.251
+++ ChangeLog 19 Apr 2014 17:41:33 -0000 1.252
@@ -1,6 +1,10 @@
# 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.251 2014/04/19 17:12:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.252 2014/04/19 17:41:33 vapier Exp $
+
+ 19 Apr 2014; Mike Frysinger <vapier@gentoo.org>
+ +files/qemu-9999-virtfs-proxy-helper-accept.patch, qemu-9999.ebuild:
+ Fix by Tim Comer for stack overflow in virtfs-proxy-helper #486714.
19 Apr 2014; Mike Frysinger <vapier@gentoo.org> qemu-1.4.2.ebuild,
qemu-1.5.3.ebuild, qemu-1.6.0-r1.ebuild, qemu-1.6.1.ebuild, qemu-1.6.2.ebuild,
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2014-05-12 18:55 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2014-05-12 18:55 UTC (permalink / raw
To: gentoo-commits
vapier 14/05/12 18:55:14
Modified: qemu-9999.ebuild ChangeLog
Log:
Drop patch now that it is merged upstream #510068 by Hristo Venev.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.70 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.70&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.70&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.69&r2=1.70
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- qemu-9999.ebuild 25 Apr 2014 22:56:26 -0000 1.69
+++ qemu-9999.ebuild 12 May 2014 18:55:14 -0000 1.70
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.69 2014/04/25 22:56:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.70 2014/05/12 18:55:14 vapier Exp $
EAPI=5
@@ -229,7 +229,6 @@
Makefile Makefile.target || die
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
- epatch "${FILESDIR}"/qemu-9999-virtfs-proxy-helper-accept.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
1.258 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.258&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.258&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.257&r2=1.258
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- ChangeLog 25 Apr 2014 22:56:26 -0000 1.257
+++ ChangeLog 12 May 2014 18:55:14 -0000 1.258
@@ -1,6 +1,9 @@
# 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.257 2014/04/25 22:56:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.258 2014/05/12 18:55:14 vapier Exp $
+
+ 12 May 2014; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Drop patch now that it is merged upstream #510068 by Hristo Venev.
25 Apr 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0.ebuild,
qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2014-05-25 17:34 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2014-05-25 17:34 UTC (permalink / raw
To: gentoo-commits
vapier 14/05/25 17:34:03
Modified: qemu-9999.ebuild ChangeLog
Log:
Also add --cxx to the 9999 ebuild.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.71 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.70&r2=1.71
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- qemu-9999.ebuild 12 May 2014 18:55:14 -0000 1.70
+++ qemu-9999.ebuild 25 May 2014 17:34:03 -0000 1.71
@@ -1,6 +1,6 @@
# 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-9999.ebuild,v 1.70 2014/05/12 18:55:14 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.71 2014/05/25 17:34:03 vapier Exp $
EAPI=5
@@ -270,6 +270,7 @@
--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)
1.260 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.260&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.260&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.259&r2=1.260
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.259
retrieving revision 1.260
diff -u -r1.259 -r1.260
--- ChangeLog 18 May 2014 18:01:59 -0000 1.259
+++ ChangeLog 25 May 2014 17:34:03 -0000 1.260
@@ -1,8 +1,9 @@
# 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.259 2014/05/18 18:01:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.260 2014/05/25 17:34:03 vapier Exp $
- 18 May 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0.ebuild:
+ 18 May 2014; Mike Frysinger <vapier@gentoo.org> qemu-2.0.0.ebuild,
+ qemu-9999.ebuild:
Set --cxx unconditionally.
12 May 2014; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-03-16 18:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-16 18:41 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/16 18:41:00
Modified: qemu-9999.ebuild ChangeLog
Log:
Handle renamed opengl configure flag #543386 by Chase Rayfield.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.94 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.93&r2=1.94
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- qemu-9999.ebuild 11 Mar 2015 18:46:46 -0000 1.93
+++ qemu-9999.ebuild 16 Mar 2015 18:41:00 -0000 1.94
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.93 2015/03/11 18:46:46 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.94 2015/03/16 18:41:00 vapier Exp $
EAPI=5
@@ -334,7 +334,7 @@
$(conf_softmmu ncurses curses)
$(conf_softmmu nfs libnfs)
$(conf_softmmu numa)
- $(conf_softmmu opengl glx)
+ $(conf_softmmu opengl)
$(conf_softmmu png vnc-png)
$(conf_softmmu rbd)
$(conf_softmmu sasl vnc-sasl)
@@ -393,7 +393,7 @@
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
- einfo "./configure ${conf_opts[*]}"
+ einfo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
1.316 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.316&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.316&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.315&r2=1.316
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -r1.315 -r1.316
--- ChangeLog 12 Mar 2015 10:06:51 -0000 1.315
+++ ChangeLog 16 Mar 2015 18:41:00 -0000 1.316
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.315 2015/03/12 10:06:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.316 2015/03/16 18:41:00 vapier Exp $
+
+ 16 Mar 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Handle renamed opengl configure flag #543386 by Chase Rayfield.
12 Mar 2015; Agostino Sarubbo <ago@gentoo.org> qemu-2.2.0.ebuild:
Stable for amd64, wrt bug #542910
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-03-28 4:15 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-03-28 4:15 UTC (permalink / raw
To: gentoo-commits
vapier 15/03/28 04:15:37
Modified: qemu-9999.ebuild ChangeLog
Log:
Put softmmu/user deps behind the respective flags so we do not pull in one set when they are not enabled #538958 by Anthoine Bourgeois.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.95 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.94&r2=1.95
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- qemu-9999.ebuild 16 Mar 2015 18:41:00 -0000 1.94
+++ qemu-9999.ebuild 28 Mar 2015 04:15:37 -0000 1.95
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.94 2015/03/16 18:41:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.95 2015/03/28 04:15:37 vapier Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
+PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
@@ -43,15 +43,13 @@
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}"
+use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
+use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
+IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
# Require at least one softmmu or user target.
# Block USE flag configurations known to not work.
-REQUIRED_USE="|| ( ${use_targets} )
+REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} )
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
@@ -77,12 +75,12 @@
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(+)] )
+ 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(+)] )
+ png? ( media-libs/libpng:0=[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
@@ -108,8 +106,9 @@
sys-firmware/sgabios
sys-firmware/vgabios
)"
-CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
- !static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
+CDEPEND="
+ !static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} ) " ${use_softmmu_targets}) )
+ !static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND//\[static-libs(+)]} ) " ${use_user_targets}) )
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
accessibility? ( app-accessibility/brltty )
@@ -137,8 +136,8 @@
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} )
+ static-softmmu? ( $(printf "%s? ( ${SOFTMMU_LIB_DEPEND} ) " ${use_softmmu_targets}) )
+ static-user? ( $(printf "%s? ( ${USER_LIB_DEPEND} ) " ${use_user_targets}) )
test? (
dev-libs/glib[utils]
sys-devel/bc
1.318 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.318&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.318&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.317&r2=1.318
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- ChangeLog 25 Mar 2015 14:04:44 -0000 1.317
+++ ChangeLog 28 Mar 2015 04:15:37 -0000 1.318
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.317 2015/03/25 14:04:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.318 2015/03/28 04:15:37 vapier Exp $
+
+ 28 Mar 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Put softmmu/user deps behind the respective flags so we do not pull in one set
+ when they are not enabled #538958 by Anthoine Bourgeois.
25 Mar 2015; Agostino Sarubbo <ago@gentoo.org> qemu-2.2.0.ebuild:
Stable for x86, wrt bug #542910
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-05-14 2:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-14 2:19 UTC (permalink / raw
To: gentoo-commits
vapier 15/05/14 02:19:40
Modified: qemu-9999.ebuild ChangeLog
Log:
Drop kvm warning as it has been ~1 year now since the changes landed.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.99 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.98&r2=1.99
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- qemu-9999.ebuild 13 May 2015 23:30:55 -0000 1.98
+++ qemu-9999.ebuild 14 May 2015 02:19:40 -0000 1.99
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.98 2015/05/13 23:30:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.99 2015/05/14 02:19:40 vapier Exp $
EAPI=5
@@ -566,21 +566,6 @@
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
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
@@ -599,7 +584,7 @@
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
+ if has_version 'sys-firmware/seabios[binary]'; then
echo " USE=binary"
else
echo " USE=''"
1.328 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.328&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.328&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.327&r2=1.328
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -r1.327 -r1.328
--- ChangeLog 13 May 2015 23:30:55 -0000 1.327
+++ ChangeLog 14 May 2015 02:19:40 -0000 1.328
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.327 2015/05/13 23:30:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.328 2015/05/14 02:19:40 vapier Exp $
+
+ 14 May 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Drop kvm warning as it has been ~1 year now since the changes landed.
13 May 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml,
qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-05-16 4:40 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-05-16 4:40 UTC (permalink / raw
To: gentoo-commits
vapier 15/05/16 04:40:40
Modified: qemu-9999.ebuild ChangeLog
Log:
Require mesa[gles2] for USE=opengl to match upstream #549558 by Michal Privoznik.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.100 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.100&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.100&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.99&r2=1.100
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- qemu-9999.ebuild 14 May 2015 02:19:40 -0000 1.99
+++ qemu-9999.ebuild 16 May 2015 04:40:40 -0000 1.100
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.99 2015/05/14 02:19:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.100 2015/05/16 04:40:40 vapier Exp $
EAPI=5
@@ -124,7 +124,10 @@
x11-libs/vte:2.90
)
iscsi? ( net-libs/libiscsi )
- opengl? ( virtual/opengl )
+ opengl? (
+ virtual/opengl
+ media-libs/mesa[gles2]
+ )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? (
1.330 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.330&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.330&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.329&r2=1.330
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- ChangeLog 14 May 2015 07:09:58 -0000 1.329
+++ ChangeLog 16 May 2015 04:40:40 -0000 1.330
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.329 2015/05/14 07:09:58 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.330 2015/05/16 04:40:40 vapier Exp $
+
+ 16 May 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Require mesa[gles2] for USE=opengl to match upstream #549558 by Michal
+ Privoznik.
14 May 2015; Agostino Sarubbo <ago@gentoo.org>
-files/qemu-2.1.1-readlink-self.patch,
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-07-25 19:30 Doug Goldstein (cardoe)
0 siblings, 0 replies; 41+ messages in thread
From: Doug Goldstein (cardoe) @ 2015-07-25 19:30 UTC (permalink / raw
To: gentoo-commits
cardoe 15/07/25 19:30:13
Modified: qemu-9999.ebuild ChangeLog
Log:
Upstream made VNC WebSockets unconditional. As of commit
8e9b0d24fb986d4241ae3b77752eca5dab4cb486 --{enable,disable}-vnc-wc
has been removed. Thanks to Daniel Scharrer <daniel@constexpr.org> for
noticing this. fixes bug #555834.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key A2BC03DC87ED1BD4!)
Revision Changes Path
1.103 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.103&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.103&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.102&r2=1.103
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- qemu-9999.ebuild 20 Jul 2015 02:19:35 -0000 1.102
+++ qemu-9999.ebuild 25 Jul 2015 19:30:13 -0000 1.103
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.102 2015/07/20 02:19:35 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.103 2015/07/25 19:30:13 cardoe Exp $
EAPI=5
@@ -360,7 +360,6 @@
$(conf_softmmu spice)
$(conf_softmmu ssh libssh2)
$(conf_softmmu tls vnc-tls)
- $(conf_softmmu tls vnc-ws)
$(conf_softmmu usb libusb)
$(conf_softmmu usbredir usb-redir)
$(conf_softmmu uuid)
1.337 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.337&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.337&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.336&r2=1.337
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.336
retrieving revision 1.337
diff -u -r1.336 -r1.337
--- ChangeLog 20 Jul 2015 02:33:42 -0000 1.336
+++ ChangeLog 25 Jul 2015 19:30:13 -0000 1.337
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.336 2015/07/20 02:33:42 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.337 2015/07/25 19:30:13 cardoe Exp $
+
+ 25 Jul 2015; Doug Goldstein <cardoe@gentoo.org> qemu-9999.ebuild:
+ Upstream made VNC WebSockets unconditional. As of commit
+ 8e9b0d24fb986d4241ae3b77752eca5dab4cb486 --{enable,disable}-vnc-wc
+ has been removed. Thanks to Daniel Scharrer <daniel@constexpr.org> for
+ noticing this. fixes bug #555834
20 Jul 2015; Mike Frysinger <vapier@gentoo.org> metadata.xml:
Use the herd tag only so people assign bugs correctly.
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-08-05 6:27 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-08-05 6:27 UTC (permalink / raw
To: gentoo-commits
vapier 15/08/05 06:27:14
Modified: qemu-9999.ebuild ChangeLog
Log:
Unify target logic a bit.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.104 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.104&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.104&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.103&r2=1.104
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- qemu-9999.ebuild 25 Jul 2015 19:30:13 -0000 1.103
+++ qemu-9999.ebuild 5 Aug 2015 06:27:13 -0000 1.104
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.103 2015/07/25 19:30:13 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.104 2015/08/05 06:27:13 vapier Exp $
EAPI=5
@@ -294,9 +294,11 @@
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
- local builddir=$2
+ local builddir="${S}/${buildtype}-build"
local static_flag="static-${buildtype}"
+ mkdir "${builddir}"
+
# audio options
local audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
@@ -378,7 +380,6 @@
conf_opts+=(
--enable-linux-user
--disable-system
- --target-list="${user_targets}"
--disable-blobs
--disable-tools
)
@@ -387,7 +388,6 @@
conf_opts+=(
--disable-linux-user
--enable-system
- --target-list="${softmmu_targets}"
--with-system-pixman
--audio-drv-list="${audio_opts}"
)
@@ -396,6 +396,9 @@
;;
esac
+ local targets="${buildtype}_targets"
+ conf_opts+=( --target-list="${!targets}" )
+
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
@@ -408,7 +411,7 @@
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
- einfo "../configure ${conf_opts[*]}"
+ echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
@@ -440,21 +443,11 @@
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
+ softmmu_targets=${softmmu_targets#,}
+ user_targets=${user_targets#,}
- if [[ -n ${user_targets} ]]; then
- mkdir "${S}/user-build"
- qemu_src_configure "user" "${S}/user-build"
- fi
+ [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
+ [[ -n ${user_targets} ]] && qemu_src_configure "user"
}
src_compile() {
1.346 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.346&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.346&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.345&r2=1.346
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.345
retrieving revision 1.346
diff -u -r1.345 -r1.346
--- ChangeLog 4 Aug 2015 08:19:33 -0000 1.345
+++ ChangeLog 5 Aug 2015 06:27:13 -0000 1.346
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.345 2015/08/04 08:19:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.346 2015/08/05 06:27:13 vapier Exp $
+
+ 05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Unify target logic a bit.
04 Aug 2015; Agostino Sarubbo <ago@gentoo.org> qemu-2.3.0-r5.ebuild:
Stable for x86, wrt bug #556630
^ permalink raw reply [flat|nested] 41+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog
@ 2015-08-05 6:47 Mike Frysinger (vapier)
0 siblings, 0 replies; 41+ messages in thread
From: Mike Frysinger (vapier) @ 2015-08-05 6:47 UTC (permalink / raw
To: gentoo-commits
vapier 15/08/05 06:47:50
Modified: qemu-9999.ebuild ChangeLog
Log:
Allow disabling of all user & softmmu targets so that the ebuild only installs the various helper tools #556712 by Matthew Thode.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path
1.106 app-emulation/qemu/qemu-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.106&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?rev=1.106&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild?r1=1.105&r2=1.106
Index: qemu-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- qemu-9999.ebuild 5 Aug 2015 06:43:00 -0000 1.105
+++ qemu-9999.ebuild 5 Aug 2015 06:47:50 -0000 1.106
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.105 2015/08/05 06:43:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.106 2015/08/05 06:47:50 vapier Exp $
EAPI=5
@@ -46,10 +46,9 @@
use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
IUSE+=" ${use_softmmu_targets} ${use_user_targets}"
-# Require at least one softmmu or user target.
+# Allow no targets to be built so that people can get a tools-only build.
# Block USE flag configurations known to not work.
-REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} )
- ${PYTHON_REQUIRED_USE}
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
gtk2? ( gtk )
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
@@ -394,10 +393,18 @@
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
;;
+ tools)
+ conf_opts+=(
+ --disable-linux-user
+ --disable-system
+ --disable-blobs
+ )
+ static_flag="static"
+ ;;
esac
local targets="${buildtype}_targets"
- conf_opts+=( --target-list="${!targets}" )
+ [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" )
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
@@ -448,6 +455,7 @@
[[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu"
[[ -n ${user_targets} ]] && qemu_src_configure "user"
+ [[ -z ${softmmu_targets}${user_targets} ]] && qemu_src_configure "tools"
}
src_compile() {
@@ -460,6 +468,11 @@
cd "${S}/softmmu-build"
default
fi
+
+ if [[ -z ${softmmu_targets}${user_targets} ]]; then
+ cd "${S}/tools-build"
+ default
+ fi
}
src_test() {
@@ -505,6 +518,11 @@
fi
fi
+ if [[ -z ${softmmu_targets}${user_targets} ]]; then
+ cd "${S}/tools-build"
+ emake DESTDIR="${ED}" install
+ 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[@]}"
1.348 app-emulation/qemu/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.348&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?rev=1.348&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu/ChangeLog?r1=1.347&r2=1.348
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v
retrieving revision 1.347
retrieving revision 1.348
diff -u -r1.347 -r1.348
--- ChangeLog 5 Aug 2015 06:43:00 -0000 1.347
+++ ChangeLog 5 Aug 2015 06:47:50 -0000 1.348
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.347 2015/08/05 06:43:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/ChangeLog,v 1.348 2015/08/05 06:47:50 vapier Exp $
+
+ 05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-9999.ebuild:
+ Allow disabling of all user & softmmu targets so that the ebuild only installs
+ the various helper tools #556712 by Matthew Thode.
05 Aug 2015; Mike Frysinger <vapier@gentoo.org> qemu-2.3.0-r5.ebuild,
qemu-9999.ebuild:
^ permalink raw reply [flat|nested] 41+ messages in thread
end of thread, other threads:[~2015-08-05 6:47 UTC | newest]
Thread overview: 41+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-28 18:31 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu: qemu-9999.ebuild ChangeLog Sergei Trofimovich (slyfox)
-- strict thread matches above, loose matches on Subject: below --
2015-08-05 6:47 Mike Frysinger (vapier)
2015-08-05 6:27 Mike Frysinger (vapier)
2015-07-25 19:30 Doug Goldstein (cardoe)
2015-05-16 4:40 Mike Frysinger (vapier)
2015-05-14 2:19 Mike Frysinger (vapier)
2015-03-28 4:15 Mike Frysinger (vapier)
2015-03-16 18:41 Mike Frysinger (vapier)
2014-05-25 17:34 Mike Frysinger (vapier)
2014-05-12 18:55 Mike Frysinger (vapier)
2014-04-19 17:41 Mike Frysinger (vapier)
2013-08-19 14:08 Doug Goldstein (cardoe)
2013-08-17 21:32 Sergei Trofimovich (slyfox)
2013-08-04 18:28 Doug Goldstein (cardoe)
2013-07-26 15:32 Sergei Trofimovich (slyfox)
2013-06-22 16:24 Sergei Trofimovich (slyfox)
2013-05-31 15:35 Sergei Trofimovich (slyfox)
2013-05-31 14:20 Sergei Trofimovich (slyfox)
2013-05-30 15:56 Doug Goldstein (cardoe)
2013-03-28 2:06 Stephen Klimaszewski (steev)
2013-02-28 16:07 Doug Goldstein (cardoe)
2013-01-21 15:07 Doug Goldstein (cardoe)
2013-01-12 7:36 Doug Goldstein (cardoe)
2013-01-10 21:04 Sergei Trofimovich (slyfox)
2012-12-05 15:38 Sergei Trofimovich (slyfox)
2012-12-04 10:20 Sergei Trofimovich (slyfox)
2012-11-21 20:02 Doug Goldstein (cardoe)
2012-11-05 6:42 Sergei Trofimovich (slyfox)
2012-11-04 22:00 Doug Goldstein (cardoe)
2012-10-29 11:15 Tiziano Mueller (dev-zero)
2012-10-09 20:40 Doug Goldstein (cardoe)
2012-09-07 13:35 Sergei Trofimovich (slyfox)
2012-06-10 20:15 Sergei Trofimovich (slyfox)
2012-01-29 12:18 Sergei Trofimovich (slyfox)
2012-01-23 21:34 Sergei Trofimovich (slyfox)
2012-01-23 19:04 William Hubbs (williamh)
2012-01-22 21:03 Sergei Trofimovich (slyfox)
2012-01-22 12:38 Sergei Trofimovich (slyfox)
2012-01-21 12:57 Sergei Trofimovich (slyfox)
2011-09-20 22:34 Michal Gorny (mgorny)
2011-06-27 19:27 Luca Barbato (lu_zero)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox