summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sysutils/xenkernel3/Makefile20
-rw-r--r--sysutils/xenkernel3/distinfo3
-rw-r--r--sysutils/xenkernel3/patches/patch-cw12
3 files changed, 32 insertions, 3 deletions
diff --git a/sysutils/xenkernel3/Makefile b/sysutils/xenkernel3/Makefile
index c6feace8a63..321200f1b97 100644
--- a/sysutils/xenkernel3/Makefile
+++ b/sysutils/xenkernel3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/10/16 20:31:57 bouyer Exp $
+# $NetBSD: Makefile,v 1.6 2007/11/22 21:49:54 bouyer Exp $
#
VERSION= 3.1.0
@@ -24,13 +24,29 @@ NO_CONFIGURE= yes
USE_TOOLS+= gmake
PYTHON_VERSIONS_ACCEPTED= 24 23
-PY_PATCHPLIST= no
+PY_PATCHPLIST= NO
SUBST_CLASSES+= py
SUBST_STAGE.py= pre-build
SUBST_FILES.py= xen/include/public/foreign/Makefile
+SUBST_FILES.py+= xen/tools/get-fields.sh
SUBST_SED.py= -e "s,python,${PYTHONBIN},g"
+#PY_PATCHPLIST doesn't work because we have NO_CONFIGURE
+SUBST_CLASSES+= py2
+SUBST_STAGE.py2= pre-build
+SUBST_FILES.py2= xen/tools/compat-build-source.py
+SUBST_FILES.py2+= xen/tools/compat-build-header.py
+SUBST_SED.py2= -e "s,/usr/bin/python,${PYTHONBIN},g"
+
+.if ${MACHINE_ARCH} == "x86_64"
+USE_TOOLS+= bash
+SUBST_CLASSES+= bash
+SUBST_STAGE.bash= pre-build
+SUBST_FILES.bash= xen/include/Makefile
+SUBST_SED.bash= -e "s,/bin/bash,${PREFIX}/bin/bash,g"
+.endif
+
do-build:
cd ${WRKSRC} && ${GMAKE} XEN_TARGET_X86_PAE=n debug=n xen
${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen.gz
diff --git a/sysutils/xenkernel3/distinfo b/sysutils/xenkernel3/distinfo
index 6ff9ee4ab2d..ec974c011ff 100644
--- a/sysutils/xenkernel3/distinfo
+++ b/sysutils/xenkernel3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2007/10/16 20:31:57 bouyer Exp $
+$NetBSD: distinfo,v 1.4 2007/11/22 21:49:55 bouyer Exp $
SHA1 (xen-3.1.0-src.tgz) = fa4b54c36626f2cce9b15dc99cafda0b42c54777
RMD160 (xen-3.1.0-src.tgz) = 2fd65a3b81e522d0ed2d62fd11e5977167f1ceb3
@@ -12,3 +12,4 @@ SHA1 (patch-ba) = a90ffef881c3fadcf3c25e4c638ef33158ec9e87
SHA1 (patch-bb) = 7338e5a512c909d4b043654dab882761de274f94
SHA1 (patch-bc) = fa35699da6ad2a4950418a02432c2ccdb5d34844
SHA1 (patch-bd) = 2a07955b1285d288458066813f8ebc801b8038c1
+SHA1 (patch-cw) = 0265eeebfe488ec6d795ee28f45a26b65a7976db
diff --git a/sysutils/xenkernel3/patches/patch-cw b/sysutils/xenkernel3/patches/patch-cw
new file mode 100644
index 00000000000..7a923c3e6aa
--- /dev/null
+++ b/sysutils/xenkernel3/patches/patch-cw
@@ -0,0 +1,12 @@
+--- 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 @@
+ debug ?= n
+
+ XEN_COMPILE_ARCH ?= $(shell uname -m | sed -e s/i.86/x86_32/ \
+- -e s/ppc/powerpc/ -e s/i86pc/x86_32/)
++ -e s/ppc/powerpc/ -e s/i86pc/x86_32/ \
++ -e s/amd64/x86_64/)
+ XEN_TARGET_ARCH ?= $(XEN_COMPILE_ARCH)
+ XEN_OS ?= $(shell uname -s)
+