Import of pkgsrc-2013Q2

sysutils/xenkernel42/DESCR

@@ -0,0 +1,12 @@
+Xen is a virtual machine monitor which supports running multiple
+guests operating systems on a single machine. Guest OSes (also
+called "domains") require a modified kernel which supports Xen
+hypercalls in replacement to access to the physical hardware. At
+boot, the xen kernel is loaded along with the guest kernel for the
+first domain (called domain0). domain0 has privileges to access
+the physical hardware (PCI and ISA devices), administrate other
+domains and provide virtual devices (disks and network) to other
+domains.
+
+This package contains the 4.2 Xen4 kernel itself.  PCI passthrough is
+not supported.  PAE is mandatory; on i386 one must use XEN3PAE_DOM[0U].

sysutils/xenkernel42/MESSAGE

@@ -0,0 +1,7 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1.1.1 2013/05/15 05:32:12 jnemeth Exp $
+
+The Xen hypervisor is installed under the following locations:
+	${XENKERNELDIR}/xen.gz		(standard hypervisor)
+	${XENKERNELDIR}/xen-debug.gz	(debug hypervisor)
+===========================================================================

sysutils/xenkernel42/Makefile

@@ -0,0 +1,54 @@
+# $NetBSD: Makefile,v 1.2 2013/06/19 14:03:41 gdt Exp $
+#
+
+VERSION=	4.2.2
+DISTNAME=	xen-${VERSION}
+PKGNAME=	xenkernel42-${VERSION}
+PKREVISION=	1
+CATEGORIES=	sysutils
+MASTER_SITES=	http://bits.xensource.com/oss-xen/release/${VERSION}/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://xenproject.org/
+COMMENT=	Xen 4.2.x Kernel
+
+LICENSE=	gnu-gpl-v2
+
+ONLY_FOR_PLATFORM=	Linux-2.6*-i386 Linux-2.6*-x86_64
+ONLY_FOR_PLATFORM+=	NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
+
+NO_CONFIGURE=	yes
+USE_TOOLS+=	gmake
+
+PYTHON_FOR_BUILD_ONLY=	YES
+
+MAKE_ENV+=	OCAML_TOOLS=no
+
+INSTALLATION_DIRS=	xen42-kernel
+XENKERNELDIR=		${PREFIX}/${INSTALLATION_DIRS}
+
+MESSAGE_SUBST+=		XENKERNELDIR=${XENKERNELDIR}
+
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+EXTRA_CFLAGS+=	-Qunused-arguments -no-integrated-as -Wno-error=format \
+		-Wno-error=parentheses-equality -Wno-error=enum-conversion
+.endif
+
+MAKE_ENV+=	EXTRA_CFLAGS=${EXTRA_CFLAGS:Q}
+
+do-build:
+	cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=n build
+	${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen.gz
+	cd ${WRKSRC}/xen && ${MAKE_PROGRAM} clean
+	cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=y build
+	${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen-debug.gz
+
+do-install:
+	${INSTALL_DATA} ${WRKDIR}/xen.gz \
+	    ${DESTDIR}${XENKERNELDIR}/xen.gz
+	${INSTALL_DATA} ${WRKDIR}/xen-debug.gz \
+	    ${DESTDIR}${XENKERNELDIR}/xen-debug.gz
+
+.include "../../lang/python/application.mk"
+.include "../../mk/bsd.pkg.mk"

sysutils/xenkernel42/PLIST

@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2013/05/15 05:32:12 jnemeth Exp $
+xen42-kernel/xen-debug.gz
+xen42-kernel/xen.gz

sysutils/xenkernel42/distinfo

@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.2 2013/06/13 21:49:59 joerg Exp $
+
+SHA1 (xen-4.2.2.tar.gz) = b48cc7f375e9a5d65ff2d680f1b512dbea5a3b7c
+RMD160 (xen-4.2.2.tar.gz) = 925cb2abdd080254a5457d1b304f811036261ab6
+Size (xen-4.2.2.tar.gz) = 15602746 bytes
+SHA1 (patch-Config.mk) = a43ed1b3304d6383dc093acd128a7f373d0ca266
+SHA1 (patch-xen_Makefile) = e0d1b74518b9675ddc64295d1523ded9a8757c0a
+SHA1 (patch-xen_arch_x86_Rules.mk) = 6b9b4bfa28924f7d3f6c793a389f1a7ac9d228e2
+SHA1 (patch-xen_arch_x86_time.c) = e5ce7e83d1dcbcc1cdffd6921f25fce4d7389ac8
+SHA1 (patch-xen_include_xen_lib.h) = 36dcaf3874a1b1214babc45d7e19fe3b556c1044

sysutils/xenkernel42/patches/patch-Config.mk

@@ -0,0 +1,13 @@
+$NetBSD: patch-Config.mk,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- Config.mk.orig	2012-12-18 12:54:16.000000000 +0000
++++ Config.mk
+@@ -16,6 +16,8 @@ SHELL     ?= /bin/sh
+ HOSTCC      = gcc
+ HOSTCFLAGS  = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer
+ HOSTCFLAGS += -fno-strict-aliasing
++HOSTCFLAGS += ${EXTRA_CFLAGS}
++CFLAGS     += ${EXTRA_CFLAGS}
+ 
+ DISTDIR     ?= $(XEN_ROOT)/dist
+ DESTDIR     ?= /

sysutils/xenkernel42/patches/patch-xen_Makefile

@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_Makefile,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/Makefile.orig	2013-04-23 16:42:55.000000000 +0000
++++ xen/Makefile
+@@ -118,7 +118,7 @@ include/xen/compile.h: include/xen/compi
+ 	    -e 's/@@whoami@@/$(XEN_WHOAMI)/g' \
+ 	    -e 's/@@domain@@/$(XEN_DOMAIN)/g' \
+ 	    -e 's/@@hostname@@/$(shell hostname)/g' \
+-	    -e 's!@@compiler@@!$(shell $(CC) $(CFLAGS) --version 2>&1 | head -1)!g' \
++	    -e 's!@@compiler@@!$(shell $(CC) $(EXTRA_CFLAGS) $(CFLAGS) --version 2>&1 | head -1)!g' \
+ 	    -e 's/@@version@@/$(XEN_VERSION)/g' \
+ 	    -e 's/@@subversion@@/$(XEN_SUBVERSION)/g' \
+ 	    -e 's/@@extraversion@@/$(XEN_EXTRAVERSION)/g' \

sysutils/xenkernel42/patches/patch-xen_arch_x86_Rules.mk

@@ -0,0 +1,12 @@
+$NetBSD: patch-xen_arch_x86_Rules.mk,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/arch/x86/Rules.mk.orig	2013-03-25 13:28:19.000000000 +0000
++++ xen/arch/x86/Rules.mk
+@@ -21,6 +21,7 @@ CFLAGS += -iwithprefix include -Werror -
+ CFLAGS += -I$(BASEDIR)/include 
+ CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
+ CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-default
++CFLAGS += $(EXTRA_CFLAGS)
+ 
+ # Prevent floating-point variables from creeping into Xen.
+ CFLAGS += -msoft-float

sysutils/xenkernel42/patches/patch-xen_arch_x86_time.c

@@ -0,0 +1,35 @@
+$NetBSD: patch-xen_arch_x86_time.c,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/arch/x86/time.c.orig	2013-04-23 16:42:55.000000000 +0000
++++ xen/arch/x86/time.c
+@@ -107,7 +107,7 @@ static inline u32 mul_frac(u32 multiplic
+ {
+     u32 product_int, product_frac;
+     asm (
+-        "mul %3"
++        "mull %3"
+         : "=a" (product_frac), "=d" (product_int)
+         : "0" (multiplicand), "r" (multiplier) );
+     return product_int;
+@@ -131,10 +131,10 @@ static inline u64 scale_delta(u64 delta,
+ 
+ #ifdef CONFIG_X86_32
+     asm (
+-        "mul  %5       ; "
++        "mull  %5       ; "
+         "mov  %4,%%eax ; "
+         "mov  %%edx,%4 ; "
+-        "mul  %5       ; "
++        "mull  %5       ; "
+         "xor  %5,%5    ; "
+         "add  %4,%%eax ; "
+         "adc  %5,%%edx ; "
+@@ -142,7 +142,7 @@ static inline u64 scale_delta(u64 delta,
+         : "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (scale->mul_frac) );
+ #else
+     asm (
+-        "mul %2 ; shrd $32,%1,%0"
++        "mulq %2 ; shrd $32,%1,%0"
+         : "=a" (product), "=d" (delta)
+         : "rm" (delta), "0" ((u64)scale->mul_frac) );
+ #endif

sysutils/xenkernel42/patches/patch-xen_include_xen_lib.h

@@ -0,0 +1,13 @@
+$NetBSD: patch-xen_include_xen_lib.h,v 1.1 2013/06/13 21:49:59 joerg Exp $
+
+--- xen/include/xen/lib.h.orig	2013-06-13 19:59:04.000000000 +0000
++++ xen/include/xen/lib.h
+@@ -42,7 +42,7 @@ do {                                    
+ #define ASSERT(p) \
+     do { if ( unlikely(!(p)) ) assert_failed(#p); } while (0)
+ #else
+-#define ASSERT(p) do { if ( 0 && (p) ); } while (0)
++#define ASSERT(p) do { if ( 0 && (p) ) (void)0; } while (0)
+ #endif
+ 
+ #define ABS(_x) ({                              \