Tue May 20 18:06:07 2014 UTC ()
Add options for qemu and xen, and disable all by default.

Before, anita depended on qemu0 or qemu.  Now, it has options for
qemu-0, qemu (currently 2) and xen (currently 4.1).  By default, all
are off because all of them are quite large and they need only be
present at run time.

Discussed with gson@, who did not object.


(gdt)
diff -r1.30 -r1.31 pkgsrc/misc/py-anita/Makefile
diff -r1.3 -r1.4 pkgsrc/misc/py-anita/options.mk
cvs diff -r1.30 -r1.31 pkgsrc/misc/py-anita/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/py-anita/Makefile 2014/05/09 07:37:12 1.30
+++ pkgsrc/misc/py-anita/Makefile 2014/05/20 18:06:07 1.31
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.30 2014/05/09 07:37:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.31 2014/05/20 18:06:07 gdt Exp $
2 2
3DISTNAME= anita-1.32 3DISTNAME= anita-1.32
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= misc 6CATEGORIES= misc
6MASTER_SITES= http://www.gson.org/netbsd/anita/download/ 7MASTER_SITES= http://www.gson.org/netbsd/anita/download/
7 8
8MAINTAINER= gson@NetBSD.org 9MAINTAINER= gson@NetBSD.org
9HOMEPAGE= http://www.gson.org/netbsd/anita/ 10HOMEPAGE= http://www.gson.org/netbsd/anita/
10COMMENT= Automated NetBSD Installation and Test Application 11COMMENT= Automated NetBSD Installation and Test Application
11LICENSE= isc 12LICENSE= isc
12 13
13DEPENDS+= cdrtools>=2.00.00.00:../../sysutils/cdrtools 14DEPENDS+= cdrtools>=2.00.00.00:../../sysutils/cdrtools
14DEPENDS+= ${PYPKGPREFIX}-pexpect>=2.1:../../devel/py-pexpect 15DEPENDS+= ${PYPKGPREFIX}-pexpect>=2.1:../../devel/py-pexpect
15 16
16USE_LANGUAGES= #none 17USE_LANGUAGES= #none
17 18
cvs diff -r1.3 -r1.4 pkgsrc/misc/py-anita/options.mk (expand / switch to unified diff)

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