Fri Feb 15 20:34:35 2008 UTC ()
Update xen3 packages to 3.1.3. Changes are mostly bugfixes and enhancement
in HVM support.


(bouyer)
diff -r1.9 -r1.10 pkgsrc/sysutils/xenkernel3/Makefile
diff -r1.7 -r1.8 pkgsrc/sysutils/xenkernel3/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/xenkernel3/patches/patch-ba
diff -r0 -r1.1 pkgsrc/sysutils/xenkernel3/patches/patch-cx
diff -r1.5 -r1.6 pkgsrc/sysutils/xentools3/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools3/buildlink3.mk
diff -r1.3 -r1.4 pkgsrc/sysutils/xentools3/distinfo
diff -r1.3 -r1.4 pkgsrc/sysutils/xentools3-hvm/Makefile
diff -r1.2 -r1.3 pkgsrc/sysutils/xentools3-hvm/distinfo
cvs diff -r1.9 -r1.10 pkgsrc/sysutils/xenkernel3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel3/Attic/Makefile 2007/12/05 22:06:26 1.9
+++ pkgsrc/sysutils/xenkernel3/Attic/Makefile 2008/02/15 20:34:35 1.10
@@ -1,33 +1,32 @@ @@ -1,33 +1,32 @@
1# $NetBSD: Makefile,v 1.9 2007/12/05 22:06:26 bouyer Exp $ 1# $NetBSD: Makefile,v 1.10 2008/02/15 20:34:35 bouyer Exp $
2# 2#
3 3
4VERSION= 3.1.2 4VERSION= 3.1.3
5DISTNAME= xen-${VERSION}-src 5DISTNAME= xen-${VERSION}-src
6PKGNAME= xenkernel3-${VERSION} 6PKGNAME= xenkernel3-${VERSION}
7PKGREVISION= 1 
8CATEGORIES= sysutils 7CATEGORIES= sysutils
9MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
10EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
11 10
12MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
13HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
14COMMENT= Xen3 Kernel 13COMMENT= Xen3 Kernel
15 14
16ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64 15ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64
17CONFLICTS= xenkernel30-* 16CONFLICTS= xenkernel30-*
18 17
19 18
20WRKSRC= ${WRKDIR}/xen-${VERSION}-src 19WRKSRC= ${WRKDIR}/xen-${VERSION}
21 20
22NO_CONFIGURE= yes 21NO_CONFIGURE= yes
23USE_TOOLS+= gmake 22USE_TOOLS+= gmake
24 23
25PYTHON_VERSIONS_ACCEPTED= 24 23 24PYTHON_VERSIONS_ACCEPTED= 24 23
26PY_PATCHPLIST= NO 25PY_PATCHPLIST= NO
27 26
28SUBST_CLASSES+= py 27SUBST_CLASSES+= py
29SUBST_STAGE.py= pre-build 28SUBST_STAGE.py= pre-build
30SUBST_FILES.py= xen/include/public/foreign/Makefile 29SUBST_FILES.py= xen/include/public/foreign/Makefile
31SUBST_FILES.py+= xen/tools/get-fields.sh 30SUBST_FILES.py+= xen/tools/get-fields.sh
32SUBST_SED.py= -e "s,python,${PYTHONBIN},g" 31SUBST_SED.py= -e "s,python,${PYTHONBIN},g"
33 32
cvs diff -r1.7 -r1.8 pkgsrc/sysutils/xenkernel3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel3/Attic/distinfo 2007/12/05 22:06:26 1.7
+++ pkgsrc/sysutils/xenkernel3/Attic/distinfo 2008/02/15 20:34:35 1.8
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.7 2007/12/05 22:06:26 bouyer Exp $ 1$NetBSD: distinfo,v 1.8 2008/02/15 20:34:35 bouyer Exp $
2 2
3SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e 3SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
4RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad 4RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
5Size (xen-3.1.2-src.tgz) = 6975860 bytes 5Size (xen-3.1.3-src.tgz) = 6891760 bytes
6SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59 6SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
7SHA1 (patch-ba) = fbc32d449d5f3410e478b92d6348f550609d1180 7SHA1 (patch-ba) = c758b1f8a6017aa37a66ed372a4c94e9bf070ebd
8SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94 8SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
9SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844 9SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
10SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1 10SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
11SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688 11SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
 12SHA1 (patch-cx) = 58804179cd4f39ccba10e3f3d40a8a6d9cee30a6
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xenkernel3/patches/Attic/patch-ba (expand / switch to unified diff)

--- pkgsrc/sysutils/xenkernel3/patches/Attic/patch-ba 2007/12/05 22:06:27 1.3
+++ pkgsrc/sysutils/xenkernel3/patches/Attic/patch-ba 2008/02/15 20:34:35 1.4
@@ -1,31 +1,23 @@ @@ -1,31 +1,23 @@
1$NetBSD: patch-ba,v 1.3 2007/12/05 22:06:27 bouyer Exp $ 1$NetBSD: patch-ba,v 1.4 2008/02/15 20:34:35 bouyer Exp $
2 2
3--- xen/arch/x86/domain_build.c.orig 2007-11-15 00:35:27.000000000 +0100 3--- xen/arch/x86/domain_build.c.orig 2008-01-31 11:06:54.000000000 +0100
4+++ xen/arch/x86/domain_build.c 2007-12-05 22:55:53.000000000 +0100 4+++ xen/arch/x86/domain_build.c 2008-02-13 21:24:12.000000000 +0100
5@@ -316,6 +316,9 @@ 5@@ -312,6 +312,9 @@
6 parms.pae ? ", PAE" : "", 6 parms.pae ? ", PAE" : "",
7 elf_msb(&elf) ? "msb" : "lsb", 7 elf_msb(&elf) ? "msb" : "lsb",
8 elf.pstart, elf.pend); 8 elf.pstart, elf.pend);
9+ if ( elf.bsd_symtab_pstart ) 9+ if ( elf.bsd_symtab_pstart )
10+ printk(" Dom0 symbol map 0x%" PRIx64 " -> 0x%" PRIx64 "\n", 10+ printk(" Dom0 symbol map 0x%" PRIx64 " -> 0x%" PRIx64 "\n",
11+ elf.bsd_symtab_pstart, elf.bsd_symtab_pend); 11+ elf.bsd_symtab_pstart, elf.bsd_symtab_pend);
12  12
13 if ( !compatible ) 13 if ( !compatible )
14 { 14 {
15@@ -349,6 +352,8 @@ 15@@ -349,6 +352,8 @@
16 if ( parms.pae == PAEKERN_extended_cr3 ) 16 if ( parms.pae == PAEKERN_extended_cr3 )
17 set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist); 17 set_bit(VMASST_TYPE_pae_extended_cr3, &d->vm_assist);
18  18
19+ d->arch.physaddr_bitsize = 64; 19+ d->arch.physaddr_bitsize = 64;
20+ 20+
21 if ( UNSET_ADDR != parms.virt_hv_start_low && elf_32bit(&elf) ) 21 if ( UNSET_ADDR != parms.virt_hv_start_low && elf_32bit(&elf) )
22 { 22 {
23 #if CONFIG_PAGING_LEVELS < 4 23 #if CONFIG_PAGING_LEVELS < 4
24@@ -642,6 +647,7 @@ 
25 l4start = l4tab = page_to_virt(page); 
26 } 
27 copy_page(l4tab, idle_pg_table); 
28+ l4tab[0] = l4e_empty(); /* zap trampoline mapping */ 
29 l4tab[l4_table_offset(LINEAR_PT_VIRT_START)] = 
30 l4e_from_paddr(__pa(l4start), __PAGE_HYPERVISOR); 
31 l4tab[l4_table_offset(PERDOMAIN_VIRT_START)] = 
File Added: pkgsrc/sysutils/xenkernel3/patches/Attic/patch-cx
$NetBSD: patch-cx,v 1.1 2008/02/15 20:34:35 bouyer Exp $

--- xen/arch/x86/mm.c.orig	2008-02-15 20:42:07.000000000 +0100
+++ xen/arch/x86/mm.c	2008-02-15 20:43:18.000000000 +0100
@@ -1478,8 +1478,6 @@
             return 0;
         }
 
-        adjust_guest_l3e(nl3e, d);
-
         /* Fast path for identical mapping and presence. */
         if (!l3e_has_changed(ol3e, nl3e, _PAGE_PRESENT))
             return UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current);
@@ -1487,6 +1485,8 @@
         if ( unlikely(!get_page_from_l3e(nl3e, pfn, d)) )
             return 0;
 
+        adjust_guest_l3e(nl3e, d);
+
         if ( unlikely(!UPDATE_ENTRY(l3, pl3e, ol3e, nl3e, pfn, current)) )
         {
             put_page_from_l3e(nl3e, pfn);
cvs diff -r1.5 -r1.6 pkgsrc/sysutils/xentools3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/Makefile 2008/01/18 05:09:45 1.5
+++ pkgsrc/sysutils/xentools3/Attic/Makefile 2008/02/15 20:34:35 1.6
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: Makefile,v 1.5 2008/01/18 05:09:45 tnn Exp $ 1# $NetBSD: Makefile,v 1.6 2008/02/15 20:34:35 bouyer Exp $
2# 2#
3 3
4VERSION= 3.1.2 4VERSION= 3.1.3
5DISTNAME= xen-${VERSION}-src 5DISTNAME= xen-${VERSION}-src
6PKGNAME= xentools3-${VERSION} 6PKGNAME= xentools3-${VERSION}
7PKGREVISION= 1 7PKGREVISION= 1
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= ${MASTER_SITE_LOCAL} 9MASTER_SITES= ${MASTER_SITE_LOCAL}
10EXTRACT_SUFX= .tgz 10EXTRACT_SUFX= .tgz
11 11
12MAINTAINER= bouyer@NetBSD.org 12MAINTAINER= bouyer@NetBSD.org
13HOMEPAGE= http://xen.org/ 13HOMEPAGE= http://xen.org/
14COMMENT= Userland Tools for Xen 14COMMENT= Userland Tools for Xen
15 15
16#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted 16#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
17DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline 17DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
18 18
19PKG_SYSCONFSUBDIR= xen 19PKG_SYSCONFSUBDIR= xen
20 20
21ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64 21ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
22ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 22ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64
23 23
24CONFLICTS+= libxen-[0-9]* 24CONFLICTS+= libxen-[0-9]*
25CONFLICTS+= xentools20-[0-9]* 25CONFLICTS+= xentools20-[0-9]*
26CONFLICTS= xentools30-* 26CONFLICTS= xentools30-*
27 27
28WRKSRC= ${WRKDIR}/xen-${VERSION}-src/tools 28WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
29CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh 29CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh
30 30
31EGDIR= ${PREFIX}/share/examples/xen 31EGDIR= ${PREFIX}/share/examples/xen
32MESSAGE_SUBST= EGDIR=${EGDIR} 32MESSAGE_SUBST= EGDIR=${EGDIR}
33 33
34USE_TOOLS+= perl #for pod2man 34USE_TOOLS+= perl #for pod2man
35USE_TOOLS+= gmake 35USE_TOOLS+= gmake
36MAKE_ENV+= CONFIG_NetBSD=yes 36MAKE_ENV+= CONFIG_NetBSD=yes
37MAKE_ENV+= CONFIG_MBOOTPACK=no 37MAKE_ENV+= CONFIG_MBOOTPACK=no
38MAKE_ENV+= EGDIR=${EGDIR:Q} 38MAKE_ENV+= EGDIR=${EGDIR:Q}
39MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} 39MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
40.if ${MACHINE_ARCH} == "i386" 40.if ${MACHINE_ARCH} == "i386"
41MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32" 41MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools3/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/buildlink3.mk 2007/12/03 21:54:30 1.2
+++ pkgsrc/sysutils/xentools3/Attic/buildlink3.mk 2008/02/15 20:34:35 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: buildlink3.mk,v 1.2 2007/12/03 21:54:30 bouyer Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2008/02/15 20:34:35 bouyer Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4XENTOOLS3_BUILDLINK3_MK:= ${XENTOOLS3_BUILDLINK3_MK}+ 4XENTOOLS3_BUILDLINK3_MK:= ${XENTOOLS3_BUILDLINK3_MK}+
5 5
6.if ${BUILDLINK_DEPTH} == "+" 6.if ${BUILDLINK_DEPTH} == "+"
7BUILDLINK_DEPENDS+= xentools3 7BUILDLINK_DEPENDS+= xentools3
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxentools3} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nxentools3}
11BUILDLINK_PACKAGES+= xentools3 11BUILDLINK_PACKAGES+= xentools3
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3
13 13
14.if ${XENTOOLS3_BUILDLINK3_MK} == "+" 14.if ${XENTOOLS3_BUILDLINK3_MK} == "+"
15BUILDLINK_API_DEPENDS.xentools3+= xentools3>=3.1.2 15BUILDLINK_API_DEPENDS.xentools3+= xentools3>=3.1.3
16BUILDLINK_PKGSRCDIR.xentools3?= ../../sysutils/xentools3 16BUILDLINK_PKGSRCDIR.xentools3?= ../../sysutils/xentools3
17.endif # XENTOOLS3_BUILDLINK3_MK 17.endif # XENTOOLS3_BUILDLINK3_MK
18 18
19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} 19BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xentools3/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/distinfo 2007/12/03 21:54:30 1.3
+++ pkgsrc/sysutils/xentools3/Attic/distinfo 2008/02/15 20:34:35 1.4
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.3 2007/12/03 21:54:30 bouyer Exp $ 1$NetBSD: distinfo,v 1.4 2008/02/15 20:34:35 bouyer Exp $
2 2
3SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e 3SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
4RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad 4RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
5Size (xen-3.1.2-src.tgz) = 6975860 bytes 5Size (xen-3.1.3-src.tgz) = 6891760 bytes
6SHA1 (patch-aa) = 86a6c9c2a43da76a5746835e13646b24e6992070 6SHA1 (patch-aa) = 86a6c9c2a43da76a5746835e13646b24e6992070
7SHA1 (patch-ab) = 424d8cc3e41d128a221f0277c1cb1d8779e97241 7SHA1 (patch-ab) = 424d8cc3e41d128a221f0277c1cb1d8779e97241
8SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855 8SHA1 (patch-ac) = 4eb0f474d4e3a685788c1ce92c0b407dc3d7a855
9SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3 9SHA1 (patch-ad) = ec36d712925ddf06aac7d6393ad818a51c4363f3
10SHA1 (patch-al) = da759ccbb2c4b48f42178cff47ace7ef42466814 10SHA1 (patch-al) = da759ccbb2c4b48f42178cff47ace7ef42466814
11SHA1 (patch-as) = 6f05feeb9dd63f2071d48b0d8aa8c6a0952e60c7 11SHA1 (patch-as) = 6f05feeb9dd63f2071d48b0d8aa8c6a0952e60c7
12SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b 12SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b
13SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373 13SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
14SHA1 (patch-aw) = 8039fa7bd7799efc48da9550f861e2212cb3361b 14SHA1 (patch-aw) = 8039fa7bd7799efc48da9550f861e2212cb3361b
15SHA1 (patch-ax) = c2fd0f25ed00498039eececcfb467a236f608efa 15SHA1 (patch-ax) = c2fd0f25ed00498039eececcfb467a236f608efa
16SHA1 (patch-ba) = 464405094eb798cce37302bdbc935561248ebd4e 16SHA1 (patch-ba) = 464405094eb798cce37302bdbc935561248ebd4e
17SHA1 (patch-bb) = d6705871ab5655719cac1df2daf03845a8d50fba 17SHA1 (patch-bb) = d6705871ab5655719cac1df2daf03845a8d50fba
18SHA1 (patch-bc) = c143c3c587f254af1552667a70e2fac1f0f9665e 18SHA1 (patch-bc) = c143c3c587f254af1552667a70e2fac1f0f9665e
cvs diff -r1.3 -r1.4 pkgsrc/sysutils/xentools3-hvm/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3-hvm/Attic/Makefile 2007/12/03 21:54:31 1.3
+++ pkgsrc/sysutils/xentools3-hvm/Attic/Makefile 2008/02/15 20:34:35 1.4
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $NetBSD: Makefile,v 1.3 2007/12/03 21:54:31 bouyer Exp $ 1# $NetBSD: Makefile,v 1.4 2008/02/15 20:34:35 bouyer Exp $
2# 2#
3 3
4VERSION= 3.1.2 4VERSION= 3.1.3
5DISTNAME= xen-${VERSION}-src 5DISTNAME= xen-${VERSION}-src
6PKGNAME= xentools3-hvm-${VERSION} 6PKGNAME= xentools3-hvm-${VERSION}
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= ${MASTER_SITE_LOCAL} 8MASTER_SITES= ${MASTER_SITE_LOCAL}
9EXTRACT_SUFX= .tgz 9EXTRACT_SUFX= .tgz
10 10
11MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
12HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
13COMMENT= Tools for Virtual Machine Extensions support in Xen 13COMMENT= Tools for Virtual Machine Extensions support in Xen
14 14
15BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware 15BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
16 16
17PKG_SYSCONFSUBDIR= xen 17PKG_SYSCONFSUBDIR= xen
18 18
19ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64 19ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
20ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 20ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64
21 21
22CONFLICTS= xentools30-* 22CONFLICTS= xentools30-*
23 23
24WRKSRC= ${WRKDIR}/xen-${VERSION}-src/tools 24WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
25CHECK_PORTABILITY_SKIP+= examples/* xm-test/ramdisk/make-release.sh 25CHECK_PORTABILITY_SKIP+= examples/* xm-test/ramdisk/make-release.sh
26 26
27EGDIR= ${PREFIX}/share/examples/xen 27EGDIR= ${PREFIX}/share/examples/xen
28MESSAGE_SUBST= EGDIR=${EGDIR} 28MESSAGE_SUBST= EGDIR=${EGDIR}
29 29
30USE_TOOLS+= perl 30USE_TOOLS+= perl
31USE_TOOLS+= gmake 31USE_TOOLS+= gmake
32MAKE_ENV+= EGDIR=${EGDIR:Q} 32MAKE_ENV+= EGDIR=${EGDIR:Q}
33MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} 33MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
34.if ${MACHINE_ARCH} == "i386" 34.if ${MACHINE_ARCH} == "i386"
35MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32" 35MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32"
36.elif ${MACHINE_ARCH} == "x86_64" 36.elif ${MACHINE_ARCH} == "x86_64"
37MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64" 37MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
cvs diff -r1.2 -r1.3 pkgsrc/sysutils/xentools3-hvm/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/sysutils/xentools3-hvm/Attic/distinfo 2007/12/03 21:54:31 1.2
+++ pkgsrc/sysutils/xentools3-hvm/Attic/distinfo 2008/02/15 20:34:35 1.3
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.2 2007/12/03 21:54:31 bouyer Exp $ 1$NetBSD: distinfo,v 1.3 2008/02/15 20:34:35 bouyer Exp $
2 2
3SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e 3SHA1 (xen-3.1.3-src.tgz) = 87b370df928feda599bbc7076e7a4589f67355c8
4RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad 4RMD160 (xen-3.1.3-src.tgz) = b26b71e0422db7aece60aa4dd9f9c8d34affd0c7
5Size (xen-3.1.2-src.tgz) = 6975860 bytes 5Size (xen-3.1.3-src.tgz) = 6891760 bytes
6SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa 6SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
7SHA1 (patch-an) = cb6e3a7eac490851f2eacf557f05daf0d6966cce 7SHA1 (patch-an) = cb6e3a7eac490851f2eacf557f05daf0d6966cce
8SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998 8SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
9SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c 9SHA1 (patch-ap) = 33f2bdbef6df3f2105d4502b8066abb6c952fc6c
10SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223 10SHA1 (patch-ar) = c8748761267dd82c75deab79d13b71d56bcf2223
11SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5 11SHA1 (patch-as) = 8850108d0c8f101642f4855184253824f9c214b5
12SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1 12SHA1 (patch-at) = 2311289176c83fcd3ff18b90bab9c2e5e05a52f1
13SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b 13SHA1 (patch-au) = beb2eaa8bf832e179e69b1758cfe0fafafdc496b
14SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373 14SHA1 (patch-av) = be2a1440126908996410f92a04ad479f8a2ca373
15SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a 15SHA1 (patch-aw) = 2776799b391983ad79af0f28367287a4a865260a
16SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713 16SHA1 (patch-ax) = 93411fbeff95f76d723fdda993d55a2740d3a713
17SHA1 (patch-ay) = 6c5b1e469d6dfd853f68a3151ee46e7c56d8247c 17SHA1 (patch-ay) = 6c5b1e469d6dfd853f68a3151ee46e7c56d8247c
18SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6 18SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6