Tue Jul 22 18:18:43 2014 UTC ()
Update comment to note that qemu 2.0.0nb4 or newer should work.


(gson)
diff -r1.5 -r1.6 pkgsrc/misc/py-anita/options.mk
cvs diff -r1.5 -r1.6 pkgsrc/misc/py-anita/options.mk (expand / switch to unified diff)

--- pkgsrc/misc/py-anita/options.mk 2014/05/21 12:19:12 1.5
+++ pkgsrc/misc/py-anita/options.mk 2014/07/22 18:18:43 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2014/05/21 12:19:12 gdt Exp $ 1# $NetBSD: options.mk,v 1.6 2014/07/22 18:18:43 gson Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.py-anita 3PKG_OPTIONS_VAR= PKG_OPTIONS.py-anita
4PKG_SUPPORTED_OPTIONS= xen 4PKG_SUPPORTED_OPTIONS= xen
5# In the future, qemu0 and qemu might install with different names, 5# In the future, qemu0 and qemu might install with different names,
6# allowing anita to choose them dynamically. For now, they conflict, 6# allowing anita to choose them dynamically. For now, they conflict,
7# so don't permit both. 7# so don't permit both.
8PKG_OPTIONS_OPTIONAL_GROUPS= qemu 8PKG_OPTIONS_OPTIONAL_GROUPS= qemu
9PKG_OPTIONS_GROUP.qemu= qemu-0 qemu  9PKG_OPTIONS_GROUP.qemu= qemu-0 qemu
10PKG_SUGGESTED_OPTIONS= 10PKG_SUGGESTED_OPTIONS=
11 11
12# To run (but not to build), anita needs some way to run a virtual 12# To run (but not to build), anita needs some way to run a virtual
13# machine. The standard approach is qemu-0, because it is known to 13# machine. The standard approach is qemu-0, because it is known to
14# work. Newer qemu is problematic. xen also works, but is less well 14# work. Newer qemu is problematic. xen also works, but is less well
@@ -16,26 +16,27 @@ PKG_SUGGESTED_OPTIONS= @@ -16,26 +16,27 @@ PKG_SUGGESTED_OPTIONS=
16 16
17# By default, py-anita does not depend on any of these, because a 17# By default, py-anita does not depend on any of these, because a
18# hypervisor one doesn't want to use is a large burden (qemu in 18# hypervisor one doesn't want to use is a large burden (qemu in
19# particular is very large). While these options can be enabled, they 19# particular is very large). While these options can be enabled, they
20# also serve to document ways to fulfill the hypervisor requirement. 20# also serve to document ways to fulfill the hypervisor requirement.
21 21
22.include "../../mk/bsd.options.mk" 22.include "../../mk/bsd.options.mk"
23 23
24.if !empty(PKG_OPTIONS:Mqemu-0) 24.if !empty(PKG_OPTIONS:Mqemu-0)
25DEPENDS+= qemu>=0.12.3nb2:../../emulators/qemu0 25DEPENDS+= qemu>=0.12.3nb2:../../emulators/qemu0
26.endif 26.endif
27 27
28.if !empty(PKG_OPTIONS:Mqemu) 28.if !empty(PKG_OPTIONS:Mqemu)
29# qemu1/2 does not work reliably. See the anita(1) man page. 29# Some versions of qemu1/2 do not work reliably, see the anita(1)
 30# man page. Version 2.0.0nb4 or newer should work.
30DEPENDS+= qemu>=1.0:../../emulators/qemu 31DEPENDS+= qemu>=1.0:../../emulators/qemu
31.endif 32.endif
32 33
33.if !empty(PKG_OPTIONS:Mxen) 34.if !empty(PKG_OPTIONS:Mxen)
34# Choose 4.1 because that has been tested (with --vmm xm) and is 35# Choose 4.1 because that has been tested (with --vmm xm) and is
35# arguably a reasonable version to recommend to people wanting to 36# arguably a reasonable version to recommend to people wanting to
36# install xen to run anita. (A good case can be made for 4.2, and 37# install xen to run anita. (A good case can be made for 4.2, and
37# anyone who has tested it with anita is welcome to change this to 38# anyone who has tested it with anita is welcome to change this to
38# 4.2.) 39# 4.2.)
39DEPENDS+= xenkernel41>=4.1:../../sysutils/xenkernel41 40DEPENDS+= xenkernel41>=4.1:../../sysutils/xenkernel41
40DEPENDS+= xentools41>=4.1:../../sysutils/xentools41 41DEPENDS+= xentools41>=4.1:../../sysutils/xentools41
41.endif 42.endif