| 1 |
cardoe 12/07/08 04:00:09 |
| 2 |
|
| 3 |
Modified: ChangeLog qemu-kvm-1.0.1-r1.ebuild |
| 4 |
Log: |
| 5 |
Add Gentoo/FreeBSD support. bug #421399 |
| 6 |
|
| 7 |
(Portage version: 2.1.10.65/cvs/Linux x86_64, RepoMan options: --force) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.124 app-emulation/qemu-kvm/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.124&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?rev=1.124&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/ChangeLog?r1=1.123&r2=1.124 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v |
| 19 |
retrieving revision 1.123 |
| 20 |
retrieving revision 1.124 |
| 21 |
diff -u -r1.123 -r1.124 |
| 22 |
--- ChangeLog 8 Jul 2012 03:25:53 -0000 1.123 |
| 23 |
+++ ChangeLog 8 Jul 2012 04:00:09 -0000 1.124 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for app-emulation/qemu-kvm |
| 26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.123 2012/07/08 03:25:53 cardoe Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/ChangeLog,v 1.124 2012/07/08 04:00:09 cardoe Exp $ |
| 29 |
+ |
| 30 |
+ 07 Jul 2012; Doug Goldstein <cardoe@g.o> qemu-kvm-1.0.1-r1.ebuild, |
| 31 |
+ +files/qemu-kvm-1.0.1-freebsd-sysctl-header.patch: |
| 32 |
+ Add Gentoo/FreeBSD support. bug #421399 |
| 33 |
|
| 34 |
07 Jul 2012; Doug Goldstein <cardoe@g.o> qemu-kvm-1.1.0.ebuild: |
| 35 |
Remove qemu-ifup as its gone and it was deprecated last release. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: qemu-kvm-1.0.1-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- qemu-kvm-1.0.1-r1.ebuild 31 May 2012 23:35:44 -0000 1.2 |
| 52 |
+++ qemu-kvm-1.0.1-r1.ebuild 8 Jul 2012 04:00:09 -0000 1.3 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2012 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v 1.2 2012/05/31 23:35:44 zmedico Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v 1.3 2012/07/08 04:00:09 cardoe Exp $ |
| 58 |
|
| 59 |
#BACKPORTS=1 |
| 60 |
|
| 61 |
@@ -21,7 +21,7 @@ |
| 62 |
${BACKPORTS:+ |
| 63 |
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2 |
| 64 |
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}" |
| 65 |
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
| 66 |
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd" |
| 67 |
fi |
| 68 |
|
| 69 |
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" |
| 70 |
@@ -30,9 +30,9 @@ |
| 71 |
LICENSE="GPL-2" |
| 72 |
SLOT="0" |
| 73 |
# xen is disabled until the deps are fixed |
| 74 |
-IUSE="+aio alsa bluetooth brltty +curl debug fdt ncurses \ |
| 75 |
-opengl pulseaudio qemu-ifup rbd sasl sdl smartcard spice static test |
| 76 |
-+threads tls usbredir vde +vhost-net xattr xen" |
| 77 |
+IUSE="+aio alsa bluetooth brltty +curl debug fdt kernel_linux \ |
| 78 |
+kernel_FreeBSD ncurses opengl pulseaudio qemu-ifup rbd sasl sdl \ |
| 79 |
+smartcard spice static test +threads tls usbredir vde +vhost-net xattr xen" |
| 80 |
|
| 81 |
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64" |
| 82 |
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb" |
| 83 |
@@ -61,7 +61,6 @@ |
| 84 |
>=dev-libs/glib-2.0 |
| 85 |
media-libs/libpng |
| 86 |
sys-apps/pciutils |
| 87 |
- >=sys-apps/util-linux-2.16.0 |
| 88 |
virtual/jpeg |
| 89 |
amd64? ( sys-apps/seabios |
| 90 |
sys-apps/vgabios ) |
| 91 |
@@ -73,6 +72,7 @@ |
| 92 |
brltty? ( app-accessibility/brltty ) |
| 93 |
curl? ( >=net-misc/curl-7.15.4 ) |
| 94 |
fdt? ( >=sys-apps/dtc-1.2.0 ) |
| 95 |
+ kernel_linux? ( >=sys-apps/util-linux-2.16.0 ) |
| 96 |
ncurses? ( sys-libs/ncurses ) |
| 97 |
opengl? ( virtual/opengl ) |
| 98 |
pulseaudio? ( media-sound/pulseaudio ) |
| 99 |
@@ -96,7 +96,7 @@ |
| 100 |
DEPEND="${RDEPEND} |
| 101 |
app-text/texi2html |
| 102 |
virtual/pkgconfig |
| 103 |
- >=sys-kernel/linux-headers-2.6.35 |
| 104 |
+ kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) |
| 105 |
test? ( dev-libs/check )" |
| 106 |
|
| 107 |
STRIP_MASK="/usr/share/qemu/palcode-clipper" |
| 108 |
@@ -136,10 +136,10 @@ |
| 109 |
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64" |
| 110 |
fi |
| 111 |
|
| 112 |
- if kernel_is lt 2 6 25; then |
| 113 |
+ if use kernel_linux && kernel_is lt 2 6 25; then |
| 114 |
eerror "This version of KVM requres a host kernel of 2.6.25 or higher." |
| 115 |
eerror "Either upgrade your kernel" |
| 116 |
- else |
| 117 |
+ elif use kernel_linux; then |
| 118 |
if ! linux_config_exists; then |
| 119 |
eerror "Unable to check your kernel for KVM support" |
| 120 |
else |
| 121 |
@@ -201,6 +201,9 @@ |
| 122 |
# Quick fix for the bad version number |
| 123 |
epatch "${FILESDIR}"/${P}-VERSION.patch |
| 124 |
|
| 125 |
+ # Patch the use of sys/sysctl.h on FreeBSD |
| 126 |
+ epatch "${FILESDIR}"/${P}-freebsd-sysctl-header.patch |
| 127 |
+ |
| 128 |
[[ -n ${BACKPORTS} ]] && \ |
| 129 |
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \ |
| 130 |
epatch |
| 131 |
@@ -250,6 +253,9 @@ |
| 132 |
use pulseaudio && audio_opts="pa ${audio_opts}" |
| 133 |
use sdl && audio_opts="sdl ${audio_opts}" |
| 134 |
|
| 135 |
+ # conditionally making UUID work on Linux only is wrong |
| 136 |
+ # but the Gentoo/FreeBSD guys need to figure out what |
| 137 |
+ # provides libuuid on their platform |
| 138 |
./configure --prefix=/usr \ |
| 139 |
--sysconfdir=/etc \ |
| 140 |
--disable-darwin-user \ |
| 141 |
@@ -257,13 +263,8 @@ |
| 142 |
--disable-libiscsi \ |
| 143 |
--disable-strip \ |
| 144 |
--disable-werror \ |
| 145 |
- --enable-kvm \ |
| 146 |
- --enable-kvm-device-assignment \ |
| 147 |
- --enable-kvm-pit \ |
| 148 |
--enable-pie \ |
| 149 |
- --enable-nptl \ |
| 150 |
--enable-tcg-interpreter \ |
| 151 |
- --enable-uuid \ |
| 152 |
--enable-vnc-jpeg \ |
| 153 |
--enable-vnc-png \ |
| 154 |
--python=python2 \ |
| 155 |
@@ -272,6 +273,11 @@ |
| 156 |
$(use_enable brltty brlapi) \ |
| 157 |
$(use_enable curl) \ |
| 158 |
$(use_enable fdt) \ |
| 159 |
+ $(use_enable kernel_linux kvm) \ |
| 160 |
+ $(use_enable kernel_linux kvm-device-assignment) \ |
| 161 |
+ $(use_enable kernel_linux kvm-pit) \ |
| 162 |
+ $(use_enable kernel_linux nptl) \ |
| 163 |
+ $(use_enable kernel_linux uuid) \ |
| 164 |
$(use_enable ncurses curses) \ |
| 165 |
$(use_enable opengl) \ |
| 166 |
$(use_enable rbd) \ |
| 167 |
@@ -299,6 +305,11 @@ |
| 168 |
# the kvm project has its own support for threaded IO |
| 169 |
# which is always on and works |
| 170 |
# --enable-io-thread \ |
| 171 |
+ |
| 172 |
+ # FreeBSD's kernel does not support QEMU assigning/grabbing |
| 173 |
+ # host USB devices yet |
| 174 |
+ use kernel_FreeBSD && \ |
| 175 |
+ sed -E -e "s|^(HOST_USB=)bsd|\1stub|" -i "${S}"/config-host.mak |
| 176 |
} |
| 177 |
|
| 178 |
src_install() { |
Archives