pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils Update the Xen3 packages to 3.1.2.
details: https://anonhg.NetBSD.org/pkgsrc/rev/02ef283c4736
branches: trunk
changeset: 536154:02ef283c4736
user: bouyer <bouyer%pkgsrc.org@localhost>
date: Mon Dec 03 21:54:28 2007 +0000
description:
Update the Xen3 packages to 3.1.2.
Package changes:
point HOMEPAGE to http://xen.org/
looks like the Xen peoples won't put a tarball on their http server
for this; I built one from their repository and put it in
${MASTER_SITE_LOCAL}
Summary of changes since 3.1.0:
some of our patches have been integrated upstream, thanks to Christoph Egger
various performances improvements and bug fixes, including some security
fixes, and one bug that would lead to floating point register
leak/corruption from HVM to PV guests on Intel VMX CPUs.
diffstat:
sysutils/xenkernel3/Makefile | 10 +++-----
sysutils/xenkernel3/distinfo | 15 +++++-------
sysutils/xenkernel3/patches/patch-ab | 13 -----------
sysutils/xenkernel3/patches/patch-ac | 22 ------------------
sysutils/xenkernel3/patches/patch-ad | 6 -----
sysutils/xenkernel3/patches/patch-ae | 39 ---------------------------------
sysutils/xenkernel3/patches/patch-cw | 2 +
sysutils/xenkernel3/patches/patch-cy | 15 ++++++++++++
sysutils/xentools3-hvm/Makefile | 10 +++-----
sysutils/xentools3-hvm/distinfo | 9 +++----
sysutils/xentools3-hvm/patches/patch-ci | 16 -------------
sysutils/xentools3/Makefile | 9 +++----
sysutils/xentools3/buildlink3.mk | 4 +-
sysutils/xentools3/distinfo | 16 ++++++------
sysutils/xentools3/patches/patch-ab | 12 +++++-----
sysutils/xentools3/patches/patch-ci | 16 -------------
sysutils/xentools3/patches/patch-co | 22 +++++++++---------
sysutils/xentools3/patches/patch-cs | 12 +++++-----
sysutils/xentools3/patches/patch-cx | 20 ++++++++++++++++
19 files changed, 92 insertions(+), 176 deletions(-)
diffs (truncated from 483 to 300 lines):
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/Makefile
--- a/sysutils/xenkernel3/Makefile Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xenkernel3/Makefile Mon Dec 03 21:54:28 2007 +0000
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.7 2007/11/26 19:35:24 bouyer Exp $
+# $NetBSD: Makefile,v 1.8 2007/12/03 21:54:28 bouyer Exp $
#
-VERSION= 3.1.0
+VERSION= 3.1.2
DISTNAME= xen-${VERSION}-src
PKGNAME= xenkernel3-${VERSION}
-PKGREVISION= 3
CATEGORIES= sysutils
-MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
- http://bits.xensource.com/oss-xen/release/${VERSION}/src.tgz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tgz
MAINTAINER= bouyer%NetBSD.org@localhost
-HOMEPAGE= http://www.cl.cam.ac.uk/research/srg/netos/xen/
+HOMEPAGE= http://xen.org/
COMMENT= Xen3 Kernel
ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 NetBSD-*-i386 Linux-2.[46]*-x86_64 NetBSD-*-x86_64
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/distinfo
--- a/sysutils/xenkernel3/distinfo Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xenkernel3/distinfo Mon Dec 03 21:54:28 2007 +0000
@@ -1,15 +1,12 @@
-$NetBSD: distinfo,v 1.5 2007/11/26 19:35:24 bouyer Exp $
+$NetBSD: distinfo,v 1.6 2007/12/03 21:54:29 bouyer Exp $
-SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
-RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
-Size (xen-3.1.0-src.tgz) = 6831094 bytes
+SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
+RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
+Size (xen-3.1.2-src.tgz) = 6975860 bytes
SHA1 (patch-aa) = 1be644e7edd3735c2850d3e581002f53bd50eb59
-SHA1 (patch-ab) = 58ba3a1ec8c1bbc895dd70d286eb5a70778b7c7f
-SHA1 (patch-ac) = 3eb6179c90090d5b05f97a66b50cf78ce50e6f56
-SHA1 (patch-ad) = 0af2e62c4a1469d03b3999cf0864c62e28d95ed0
-SHA1 (patch-ae) = 3bba21641c64d572a845966e6600d686e6d86983
SHA1 (patch-ba) = f9a576b74a7039167aee57d9583ac99e9cbf70a1
SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
-SHA1 (patch-cw) = 0265eeebfe488ec6d795ee28f45a26b65a7976db
+SHA1 (patch-cw) = 83a0f34dac9ba9a465c7362d4de6706afb84d688
+SHA1 (patch-cy) = 6fcaa3284442b19f6580173ac8753d9216fa10cf
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-ab
--- a/sysutils/xenkernel3/patches/patch-ab Mon Dec 03 20:26:24 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- ./xen/arch/x86/shutdown.c.orig 2007-08-16 21:52:39.000000000 +0200
-+++ ./xen/arch/x86/shutdown.c 2007-08-16 21:53:03.000000000 +0200
-@@ -197,7 +197,7 @@
-
- #endif
-
--void machine_restart(char * __unused)
-+void machine_restart(char * __unused u)
- {
- int i;
-
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-ac
--- a/sysutils/xenkernel3/patches/patch-ac Mon Dec 03 20:26:24 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- xen/tools/symbols.c.orig 2007-08-16 21:46:28.000000000 +0200
-+++ xen/tools/symbols.c 2007-08-16 21:51:22.000000000 +0200
-@@ -103,7 +103,7 @@
- _sextratext = s->addr;
- else if (strcmp(sym, "_eextratext") == 0)
- _eextratext = s->addr;
-- else if (toupper(stype) == 'A')
-+ else if (toupper((int)stype) == 'A')
- {
- /* Keep these useful absolute symbols */
- if (strcmp(sym, "__kernel_syscall_via_break") &&
-@@ -113,7 +113,7 @@
- return -1;
-
- }
-- else if (toupper(stype) == 'U' ||
-+ else if (toupper((int)stype) == 'U' ||
- is_arm_mapping_symbol(sym))
- return -1;
- /* exclude also MIPS ELF local symbols ($L123 instead of .L123) */
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-ad
--- a/sysutils/xenkernel3/patches/patch-ad Mon Dec 03 20:26:24 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/08/17 17:26:04 bouyer Exp $
-
---- config/NetBSD.mk.orig 2007-08-16 21:44:15.000000000 +0200
-+++ config/NetBSD.mk 2007-08-16 21:44:08.000000000 +0200
-@@ -0,0 +1 @@
-+include $(XEN_ROOT)/config/StdGNU.mk
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-ae
--- a/sysutils/xenkernel3/patches/patch-ae Mon Dec 03 20:26:24 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/10/16 20:31:57 bouyer Exp $
-
---- xen/arch/x86/mm.c.orig 2007-05-18 16:45:21.000000000 +0200
-+++ xen/arch/x86/mm.c 2007-10-17 05:03:09.000000000 +0200
-@@ -1741,15 +1741,26 @@
- nx |= PGT_validated;
- }
- }
-- else if ( unlikely((x & (PGT_type_mask|PGT_pae_xen_l2)) != type) )
-+ else if (unlikely((x & (PGT_type_mask|PGT_pae_xen_l2)) != type) )
- {
-- if ( ((x & PGT_type_mask) != PGT_l2_page_table) ||
-- (type != PGT_l1_page_table) )
-- MEM_LOG("Bad type (saw %" PRtype_info
-- " != exp %" PRtype_info ") "
-- "for mfn %lx (pfn %lx)",
-- x, type, page_to_mfn(page),
-- get_gpfn_from_mfn(page_to_mfn(page)));
-+ /*
-+ * if it's a recursive mapping failure here is expected.
-+ * Don't log it
-+ */
-+ if ((x & PGT_type_mask) == PGT_l2_page_table &&
-+ type == PGT_l1_page_table)
-+ return 0;
-+ if ((x & PGT_type_mask) == PGT_l3_page_table &&
-+ type == PGT_l2_page_table)
-+ return 0;
-+ if ((x & PGT_type_mask) == PGT_l4_page_table &&
-+ type == PGT_l3_page_table)
-+ return 0;
-+ MEM_LOG("Bad type (saw %" PRtype_info
-+ " != exp %" PRtype_info ") "
-+ "for mfn %lx (pfn %lx)",
-+ x, type, page_to_mfn(page),
-+ get_gpfn_from_mfn(page_to_mfn(page)));
- return 0;
- }
- else if ( unlikely(!(x & PGT_validated)) )
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-cw
--- a/sysutils/xenkernel3/patches/patch-cw Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xenkernel3/patches/patch-cw Mon Dec 03 21:54:28 2007 +0000
@@ -1,3 +1,5 @@
+$NetBSD: patch-cw,v 1.2 2007/12/03 21:54:30 bouyer Exp $
+
--- Config.mk.orig 2007-11-21 13:26:05.000000000 +0100
+++ Config.mk 2007-11-21 13:26:40.000000000 +0100
@@ -4,7 +4,8 @@
diff -r 008351750b33 -r 02ef283c4736 sysutils/xenkernel3/patches/patch-cy
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sysutils/xenkernel3/patches/patch-cy Mon Dec 03 21:54:28 2007 +0000
@@ -0,0 +1,15 @@
+$NetBSD: patch-cy,v 1.1 2007/12/03 21:54:30 bouyer Exp $
+
+--- xen/arch/x86/domain_build.c.orig 2007-12-03 21:59:10.000000000 +0100
++++ xen/arch/x86/domain_build.c 2007-12-03 22:01:57.000000000 +0100
+@@ -768,6 +768,10 @@
+ l1start = l1tab = l2e_to_l1e(*l2tab);
+ }
+ }
++ /* make sure remaining entries are clear */
++ l4tab = l4start;
++ for ( count = 0; count < ROOT_PAGETABLE_FIRST_XEN_SLOT; count++)
++ l4tab[count].l4 = 0;
+
+ #endif /* __x86_64__ */
+
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3-hvm/Makefile
--- a/sysutils/xentools3-hvm/Makefile Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xentools3-hvm/Makefile Mon Dec 03 21:54:28 2007 +0000
@@ -1,17 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2007/12/02 18:55:30 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/03 21:54:31 bouyer Exp $
#
-VERSION= 3.1.0
-PKGREVISION= 1
+VERSION= 3.1.2
DISTNAME= xen-${VERSION}-src
PKGNAME= xentools3-hvm-${VERSION}
CATEGORIES= sysutils
-MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
- http://bits.xensource.com/oss-xen/release/${VERSION}/src.tgz/
+MASTER_SITES= ${MASTER_SITE_LOCAL}
EXTRACT_SUFX= .tgz
MAINTAINER= bouyer%NetBSD.org@localhost
-HOMEPAGE= http://www.cl.cam.ac.uk/research/srg/netos/xen/
+HOMEPAGE= http://xen.org/
COMMENT= Tools for Virtual Machine Extensions support in Xen
BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3-hvm/distinfo
--- a/sysutils/xentools3-hvm/distinfo Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xentools3-hvm/distinfo Mon Dec 03 21:54:28 2007 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
+$NetBSD: distinfo,v 1.2 2007/12/03 21:54:31 bouyer Exp $
-SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
-RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
-Size (xen-3.1.0-src.tgz) = 6831094 bytes
+SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
+RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
+Size (xen-3.1.2-src.tgz) = 6975860 bytes
SHA1 (patch-aa) = 663c798a472501d4c38add5049faded5b7e807aa
SHA1 (patch-an) = cb6e3a7eac490851f2eacf557f05daf0d6966cce
SHA1 (patch-ao) = d1250258d09cf9b330a4e9d52e85332a0eef7998
@@ -18,7 +18,6 @@
SHA1 (patch-ba) = ee151472a9ec28301b67e696e81673c4bf753ed6
SHA1 (patch-bb) = 19e3d323efab335a50f0410d1197ecbee5b7798b
SHA1 (patch-bv) = 2ba938aef7a5c9eb417e443577b841bae0e0550a
-SHA1 (patch-ci) = 1338452d7994b3de40e80fb395175ddbe325b577
SHA1 (patch-ck) = d085b0ced66544963441fff5231e06fd9ac03878
SHA1 (patch-cl) = ad26eee7b315ec512453c73cdc29253e0fa6266f
SHA1 (patch-cp) = 1f774a6636ce6646fc83bab304e84ce2d8886db5
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3-hvm/patches/patch-ci
--- a/sysutils/xentools3-hvm/patches/patch-ci Mon Dec 03 20:26:24 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ci,v 1.1.1.1 2007/06/14 19:42:12 bouyer Exp $
-
---- ../xen/include/public/arch-x86/xen.h.orig 2007-04-25 19:25:41.000000000 +0200
-+++ ../xen/include/public/arch-x86/xen.h 2007-04-25 19:25:43.000000000 +0200
-@@ -35,9 +35,10 @@
- #define __DEFINE_XEN_GUEST_HANDLE(name, type) \
- typedef type * __guest_handle_ ## name
- #endif
-+#define __XEN_GUEST_HANDLE(name) __guest_handle_ ## name
-
- #define DEFINE_XEN_GUEST_HANDLE(name) __DEFINE_XEN_GUEST_HANDLE(name, name)
--#define XEN_GUEST_HANDLE(name) __guest_handle_ ## name
-+#define XEN_GUEST_HANDLE(name) __XEN_GUEST_HANDLE(name)
- #define set_xen_guest_handle(hnd, val) do { (hnd).p = val; } while (0)
- #ifdef __XEN_TOOLS__
- #define get_xen_guest_handle(val, hnd) do { val = (hnd).p; } while (0)
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3/Makefile
--- a/sysutils/xentools3/Makefile Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xentools3/Makefile Mon Dec 03 21:54:28 2007 +0000
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile,v 1.2 2007/11/17 16:45:32 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/03 21:54:30 bouyer Exp $
#
-VERSION= 3.1.0
+VERSION= 3.1.2
DISTNAME= xen-${VERSION}-src
PKGNAME= xentools3-${VERSION}
CATEGORIES= sysutils
-MASTER_SITES= http://www.cl.cam.ac.uk/research/srg/netos/xen/downloads/ \
- http://bits.xensource.com/oss-xen/release/${VERSION}/src.tgz/
+MASTER_SITES= ${MASTER_SITES_LOCAL}
EXTRACT_SUFX= .tgz
MAINTAINER= bouyer%NetBSD.org@localhost
-HOMEPAGE= http://www.cl.cam.ac.uk/research/srg/netos/xen/
+HOMEPAGE= http://xen.org/
COMMENT= Userland Tools for Xen
#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3/buildlink3.mk
--- a/sysutils/xentools3/buildlink3.mk Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xentools3/buildlink3.mk Mon Dec 03 21:54:28 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/06/14 19:39:45 bouyer Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/12/03 21:54:30 bouyer Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
XENTOOLS3_BUILDLINK3_MK:= ${XENTOOLS3_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@
BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}xentools3
.if ${XENTOOLS3_BUILDLINK3_MK} == "+"
-BUILDLINK_API_DEPENDS.xentools3+= xentools3>=3.1.0
+BUILDLINK_API_DEPENDS.xentools3+= xentools3>=3.1.2
BUILDLINK_PKGSRCDIR.xentools3?= ../../sysutils/xentools3
.endif # XENTOOLS3_BUILDLINK3_MK
diff -r 008351750b33 -r 02ef283c4736 sysutils/xentools3/distinfo
--- a/sysutils/xentools3/distinfo Mon Dec 03 20:26:24 2007 +0000
+++ b/sysutils/xentools3/distinfo Mon Dec 03 21:54:28 2007 +0000
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2007/11/17 16:45:32 bouyer Exp $
+$NetBSD: distinfo,v 1.3 2007/12/03 21:54:30 bouyer Exp $
-SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
-RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
-Size (xen-3.1.0-src.tgz) = 6831094 bytes
+SHA1 (xen-3.1.2-src.tgz) = 475499fd2c3f917a5e8e7f95950dedf9c6fa295e
+RMD160 (xen-3.1.2-src.tgz) = 90413e82899f422b16407de156b88ad54b6e05ad
+Size (xen-3.1.2-src.tgz) = 6975860 bytes
SHA1 (patch-aa) = 86a6c9c2a43da76a5746835e13646b24e6992070
-SHA1 (patch-ab) = dda7b5fefec4136f9d4b39a9598bc7a965ba3937
Home |
Main Index |
Thread Index |
Old Index