* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-0.15.1.ebuild
@ 2011-10-21 17:01 Doug Goldstein (cardoe)
0 siblings, 0 replies; 4+ messages in thread
From: Doug Goldstein (cardoe) @ 2011-10-21 17:01 UTC (permalink / raw
To: gentoo-commits
cardoe 11/10/21 17:01:15
Modified: ChangeLog
Added: qemu-kvm-0.15.1.ebuild
Log:
Version bump. Switch to using the seabios package. Slowly we'll be replacing all the blobs with built ones.
(Portage version: 2.1.10.30/cvs/Linux x86_64)
Revision Changes Path
1.69 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.69&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.69&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.68&r2=1.69
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- ChangeLog 21 Oct 2011 03:13:05 -0000 1.68
+++ ChangeLog 21 Oct 2011 17:01:14 -0000 1.69
@@ -1,6 +1,12 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.68 2011/10/21 03:13:05 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.69 2011/10/21 17:01:14 cardoe Exp $
+
+*qemu-kvm-0.15.1 (21 Oct 2011)
+
+ 21 Oct 2011; Doug Goldstein <cardoe@gentoo.org> +qemu-kvm-0.15.1.ebuild:
+ Version bump. Switch to using the seabios package. Slowly we'll be replacing
+ all the blobs with built ones.
21 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
qemu-kvm-9999.ebuild:
1.1 app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.1&content-type=text/plain
Index: qemu-kvm-0.15.1.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-kvm/qemu-kvm-0.15.1.ebuild,v 1.1 2011/10/21 17:01:14 cardoe Exp $
#BACKPORTS=1
EAPI="3"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
GIT_ECLASS="git-2"
fi
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
if [[ ${PV} = *9999* ]]; then
SRC_URI=""
KEYWORDS=""
else
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
${BACKPORTS:+
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.linux-kvm.org"
LICENSE="GPL-2"
SLOT="0"
# xen is disabled until the deps are fixed
IUSE="+aio alsa bluetooth brltty curl debug esd fdt hardened jpeg ncurses nss \
png pulseaudio qemu-ifup rbd sasl sdl spice ssl threads vde \
+vhost-net xattr xen"
# static, depends on libsdl being built with USE=static-libs, which can not
# be expressed in current EAPI's
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"
# 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"
for target in ${IUSE_SOFTMMU_TARGETS}; do
if [ "x${target}" = "xx86_64" ]; then
continue
fi
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/kqemu
!app-emulation/qemu
!app-emulation/qemu-user
>=dev-libs/glib-2.0
sys-apps/pciutils
>=sys-apps/util-linux-2.16.0
sys-libs/zlib
sys-apps/seabios
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
brltty? ( app-accessibility/brltty )
curl? ( >=net-misc/curl-7.15.4 )
esd? ( media-sound/esound )
fdt? ( >=sys-apps/dtc-1.2.0 )
jpeg? ( virtual/jpeg )
ncurses? ( sys-libs/ncurses )
nss? ( dev-libs/nss )
png? ( media-libs/libpng )
pulseaudio? ( media-sound/pulseaudio )
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.6.0 )
ssl? ( net-libs/gnutls )
vde? ( net-misc/vde )
xattr? ( sys-apps/attr )
xen? ( app-emulation/xen )
"
DEPEND="${RDEPEND}
app-text/texi2html
>=sys-kernel/linux-headers-2.6.35
ssl? ( dev-util/pkgconfig )
"
kvm_kern_warn() {
eerror "Please enable KVM support in your kernel, found at:"
eerror
eerror " Virtualization"
eerror " Kernel-based Virtual Machine (KVM) support"
eerror
}
pkg_setup() {
if ! use qemu_softmmu_targets_x86_64 && use x86_64 ; then
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
fi
if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
fi
if kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
eerror "Either upgrade your kernel"
else
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
kvm_kern_warn
elif ! linux_chkconfig_present KVM; then
kvm_kern_warn
fi
if use vhost-net && ! linux_chkconfig_present VHOST_NET ; then
ewarn "You have to enable CONFIG_VHOST_NET in the kernel"
ewarn "to have vhost-net support."
fi
fi
enewgroup kvm
}
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
# remove part to make udev happy
sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
# to the qemu-devel ml - bug 337988
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
}
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
eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
die "At least 1 SoftMMU target must be enabled"
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"
# Support debug USE flag
use debug && conf_opts="${conf_opts} --enable-debug --disable-strip"
# 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 nss smartcard-nss)"
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"
# 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 \
--enable-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_install() {
emake DESTDIR="${D}" install || die "make install failed"
if [ ! -z "${softmmu_targets}" ]; then
insinto /$(get_libdir)/udev/rules.d/
doins kvm/scripts/65-kvm.rules || die
if use qemu-ifup; then
insinto /etc/qemu/
insopts -m0755
doins kvm/scripts/qemu-ifup || die
fi
if use qemu_softmmu_targets_x86_64 ; then
dobin "${FILESDIR}"/qemu-kvm
dosym /usr/bin/qemu-kvm /usr/bin/kvm
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 || die
newdoc pc-bios/README README.pc-bios || die
dohtml qemu-doc.html qemu-tech.html || die
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${D}/usr/share/qemu/bios.bin"
insinto /usr/share/qemu
dosym ../seabios/bios.bin
}
pkg_postinst() {
if [ ! -z "${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 "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 "kvm-ifup script from /etc/kvm."
elog
elog "The gnutls use flag was renamed to ssl, so adjust your use flags."
fi
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-0.15.1.ebuild
@ 2011-10-22 22:56 Doug Goldstein (cardoe)
0 siblings, 0 replies; 4+ messages in thread
From: Doug Goldstein (cardoe) @ 2011-10-22 22:56 UTC (permalink / raw
To: gentoo-commits
cardoe 11/10/22 22:56:50
Modified: ChangeLog qemu-kvm-0.15.1.ebuild
Log:
inherit python eclass so that we can set the active version to 2.x since qemu-kvm doesn't work with 3.x. bug #379015
(Portage version: 2.1.10.30/cvs/Linux x86_64)
Revision Changes Path
1.71 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.71&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.71&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.70&r2=1.71
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- ChangeLog 21 Oct 2011 18:31:32 -0000 1.70
+++ ChangeLog 22 Oct 2011 22:56:49 -0000 1.71
@@ -1,6 +1,10 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.70 2011/10/21 18:31:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.71 2011/10/22 22:56:49 cardoe Exp $
+
+ 22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
+ inherit python eclass so that we can set the active version to 2.x since
+ qemu-kvm doesn't work with 3.x. bug #379015
21 Oct 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
qemu-kvm-0.15.1.ebuild, qemu-kvm-9999.ebuild:
1.3 app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?r1=1.2&r2=1.3
Index: qemu-kvm-0.15.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- qemu-kvm-0.15.1.ebuild 21 Oct 2011 18:31:32 -0000 1.2
+++ qemu-kvm-0.15.1.ebuild 22 Oct 2011 22:56:49 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.2 2011/10/21 18:31:32 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.3 2011/10/22 22:56:49 cardoe Exp $
#BACKPORTS=1
@@ -12,7 +12,7 @@
GIT_ECLASS="git-2"
fi
-inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib
+inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python
if [[ ${PV} = *9999* ]]; then
SRC_URI=""
@@ -130,6 +130,8 @@
fi
fi
+ python_set_active_version 2
+
enewgroup kvm
}
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-0.15.1.ebuild
@ 2011-10-22 23:00 Doug Goldstein (cardoe)
0 siblings, 0 replies; 4+ messages in thread
From: Doug Goldstein (cardoe) @ 2011-10-22 23:00 UTC (permalink / raw
To: gentoo-commits
cardoe 11/10/22 23:00:17
Modified: ChangeLog qemu-kvm-0.15.1.ebuild
Log:
Only depend on sys-apps/seabios on x86 & amd64 since it will only compile there. Use the shipping binary for ppc & ppc64 so we can re-support those arches. I'll have to figure out a permenant solution for this.
(Portage version: 2.1.10.30/cvs/Linux x86_64)
Revision Changes Path
1.72 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.71&r2=1.72
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog 22 Oct 2011 22:56:49 -0000 1.71
+++ ChangeLog 22 Oct 2011 23:00:17 -0000 1.72
@@ -1,6 +1,11 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.71 2011/10/22 22:56:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.72 2011/10/22 23:00:17 cardoe Exp $
+
+ 22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
+ Only depend on sys-apps/seabios on x86 & amd64 since it will only compile
+ there. Use the shipping binary for ppc & ppc64 so we can re-support those
+ arches. I'll have to figure out a permenant solution for this.
22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
inherit python eclass so that we can set the active version to 2.x since
1.4 app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?r1=1.3&r2=1.4
Index: qemu-kvm-0.15.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qemu-kvm-0.15.1.ebuild 22 Oct 2011 22:56:49 -0000 1.3
+++ qemu-kvm-0.15.1.ebuild 22 Oct 2011 23:00:17 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.3 2011/10/22 22:56:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.4 2011/10/22 23:00:17 cardoe Exp $
#BACKPORTS=1
@@ -22,7 +22,7 @@
${BACKPORTS:+
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@@ -67,7 +67,8 @@
sys-apps/pciutils
>=sys-apps/util-linux-2.16.0
sys-libs/zlib
- sys-apps/seabios
+ amd64? ( sys-apps/seabios )
+ x86? ( sys-apps/seabios )
aio? ( dev-libs/libaio )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
@@ -270,10 +271,13 @@
newdoc pc-bios/README README.pc-bios || die
dohtml qemu-doc.html qemu-tech.html || die
- # Remove SeaBIOS since we're using the SeaBIOS packaged one
- rm "${D}/usr/share/qemu/bios.bin"
- insinto /usr/share/qemu
- dosym ../seabios/bios.bin
+ # FIXME: Need to come up with a solution for non-x86 based systems
+ if use x86 || use amd64; then
+ # Remove SeaBIOS since we're using the SeaBIOS packaged one
+ rm "${D}/usr/share/qemu/bios.bin"
+ insinto /usr/share/qemu
+ dosym ../seabios/bios.bin
+ fi
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 4+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-0.15.1.ebuild
@ 2011-10-24 18:27 Doug Goldstein (cardoe)
0 siblings, 0 replies; 4+ messages in thread
From: Doug Goldstein (cardoe) @ 2011-10-24 18:27 UTC (permalink / raw
To: gentoo-commits
cardoe 11/10/24 18:27:09
Modified: ChangeLog qemu-kvm-0.15.1.ebuild
Log:
Add 2nd argument to dosym. bug #388039
(Portage version: 2.1.10.31/cvs/Linux x86_64)
Revision Changes Path
1.73 app-emulation/qemu-kvm/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 22 Oct 2011 23:00:17 -0000 1.72
+++ ChangeLog 24 Oct 2011 18:27:09 -0000 1.73
@@ -1,6 +1,9 @@
# ChangeLog for app-emulation/qemu-kvm
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.72 2011/10/22 23:00:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.73 2011/10/24 18:27:09 cardoe Exp $
+
+ 24 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
+ Add 2nd argument to dosym. bug #388039
22 Oct 2011; Doug Goldstein <cardoe@gentoo.org> qemu-kvm-0.15.1.ebuild:
Only depend on sys-apps/seabios on x86 & amd64 since it will only compile
1.5 app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild?r1=1.4&r2=1.5
Index: qemu-kvm-0.15.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qemu-kvm-0.15.1.ebuild 22 Oct 2011 23:00:17 -0000 1.4
+++ qemu-kvm-0.15.1.ebuild 24 Oct 2011 18:27:09 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.4 2011/10/22 23:00:17 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-0.15.1.ebuild,v 1.5 2011/10/24 18:27:09 cardoe Exp $
#BACKPORTS=1
@@ -276,7 +276,7 @@
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${D}/usr/share/qemu/bios.bin"
insinto /usr/share/qemu
- dosym ../seabios/bios.bin
+ dosym ../seabios/bios.bin bios.bin
fi
}
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-24 18:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-22 23:00 [gentoo-commits] gentoo-x86 commit in app-emulation/qemu-kvm: ChangeLog qemu-kvm-0.15.1.ebuild Doug Goldstein (cardoe)
-- strict thread matches above, loose matches on Subject: below --
2011-10-24 18:27 Doug Goldstein (cardoe)
2011-10-22 22:56 Doug Goldstein (cardoe)
2011-10-21 17:01 Doug Goldstein (cardoe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox