Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Integrate Xen to the i386 build process:
details: https://anonhg.NetBSD.org/src/rev/0fec79bc6315
branches: trunk
changeset: 574772:0fec79bc6315
user: bouyer <bouyer%NetBSD.org@localhost>
date: Fri Mar 11 20:55:10 2005 +0000
description:
Integrate Xen to the i386 build process:
- Add xen devices to MAKEDEV
- Add Xen kernels to list of kernel to build
- Add INSTALL_XENU to the install kernels
- introduce the xbd disk devices to sysinst.
This will add 3 kernels to the i386 release:
XEN0 for use as a Xen domain0 kernel
XENU for use on a non-privileged domain
INSTALL_XENU to install NetBSD on a non-privileged domain virtual disk.
diffstat:
distrib/i386/floppies/instkernel/Makefile | 3 ++-
distrib/utils/sysinst/arch/i386/md.h | 4 ++--
etc/MAKEDEV.tmpl | 18 +++++++++++++++++-
etc/etc.i386/MAKEDEV.conf | 7 ++++++-
etc/etc.i386/Makefile.inc | 6 +++---
5 files changed, 30 insertions(+), 8 deletions(-)
diffs (145 lines):
diff -r d3502e392307 -r 0fec79bc6315 distrib/i386/floppies/instkernel/Makefile
--- a/distrib/i386/floppies/instkernel/Makefile Fri Mar 11 20:48:24 2005 +0000
+++ b/distrib/i386/floppies/instkernel/Makefile Fri Mar 11 20:55:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/11/18 12:39:46 lukem Exp $
+# $NetBSD: Makefile,v 1.4 2005/03/11 20:55:10 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -17,6 +17,7 @@
MDSETTARGETS= INSTALL ${RAMDISK_B} - \
INSTALL_LAPTOP ${RAMDISK_B} - \
+ INSTALL_XENU ${RAMDISK_B} - \
INSTALL_SMALL ${RAMDISK_S} - \
INSTALL_TINY ${RAMDISK_T} - \
INSTALL_PS2 ${RAMDISK_S} - \
diff -r d3502e392307 -r 0fec79bc6315 distrib/utils/sysinst/arch/i386/md.h
--- a/distrib/utils/sysinst/arch/i386/md.h Fri Mar 11 20:48:24 2005 +0000
+++ b/distrib/utils/sysinst/arch/i386/md.h Fri Mar 11 20:55:10 2005 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: md.h,v 1.53 2004/08/14 16:06:41 dsl Exp $ */
+/* $NetBSD: md.h,v 1.54 2005/03/11 20:55:10 bouyer Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -84,7 +84,7 @@
* On i386, we allow "wd" ST-506/IDE disks, "sd" scsi disks, "ld" logical
* disks, "ed" IBM ESDI disks, "raid" raidframe disks
*/
-#define DISK_NAMES "wd", "sd", "ld", "ed", "raid:no_mbr"
+#define DISK_NAMES "wd", "sd", "ld", "ed", "raid:no_mbr", "xbd:no_mbr"
/*
* Machine-specific command to write a new label to a disk.
diff -r d3502e392307 -r 0fec79bc6315 etc/MAKEDEV.tmpl
--- a/etc/MAKEDEV.tmpl Fri Mar 11 20:48:24 2005 +0000
+++ b/etc/MAKEDEV.tmpl Fri Mar 11 20:55:10 2005 +0000
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.38 2005/01/08 22:31:28 cube Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.39 2005/03/11 20:55:10 bouyer Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -88,6 +88,7 @@
# rx* MSCP floppy disk (RX33/50/...)
# up* other UNIBUS devices (e.g. on Emulex SC-21V controller)
# vnd* "file" pseudo-disks
+# xbd* Xen virtual disks
# xd* Xylogic 753/7053 disks
# xy* Xylogic 450/451 disks
#
@@ -150,6 +151,7 @@
# dhu* UNIBUS DHU11 (vax)
# dmz* UNIBUS DMZ32 (vax)
# dl* UNIBUS DL11 (vax)
+# xencons Xen virtual console
#
# Terminal multiplexors:
# dc* 4 channel serial interface (keyboard, mouse, modem, printer)
@@ -275,6 +277,7 @@
# view* generic interface to graphic displays (Amiga)
# wsfont* console font control
# wsmux* wscons event multiplexor
+# xenevt Xen event interface
PATH=/sbin:/usr/sbin:/bin:/usr/bin:/rescue
@@ -565,6 +568,14 @@
mkdev wsmuxctl$unit c %wsmux_chr% $(($unit + 128)) 200
;;
+xenevt)
+ mkdev xenevt c %xenevt_chr% 0
+ ;;
+
+xencons)
+ mkdev xencons c %xencons_chr% 0
+ ;;
+
ttyEstat)
mkdev ttyEstat c %wsdisplay_chr% 254
;;
@@ -674,6 +685,11 @@
%MKDISK% $name $unit $blk $chr
;;
+xbd*)
+ name=xbd; unit=${i#xbd}; blk=%xbd_blk%; chr=%xbd_chr%
+ %MKDISK% $name $unit $blk $chr
+ ;;
+
ttyCY*)
name=tyCY; chr=%cy_chr%; off=32
unit=${i#t${name}}
diff -r d3502e392307 -r 0fec79bc6315 etc/etc.i386/MAKEDEV.conf
--- a/etc/etc.i386/MAKEDEV.conf Fri Mar 11 20:48:24 2005 +0000
+++ b/etc/etc.i386/MAKEDEV.conf Fri Mar 11 20:55:10 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MAKEDEV.conf,v 1.3 2004/12/02 16:44:28 christos Exp $
+# $NetBSD: MAKEDEV.conf,v 1.4 2005/03/11 20:55:10 bouyer Exp $
# As of 2003-04-17, the "init" case must not create more than 890 entries.
init)
@@ -12,6 +12,7 @@
makedev ed0 ed1
makedev raid0
makedev ld0 ld1 ld2 ld3
+ makedev xbd0
makedev usbs
makedev ipty
makedev local
@@ -42,6 +43,10 @@
makedev nsmb
;;
+xen)
+ makedev xenevt xencons
+ ;;
+
floppy)
makedev std wt0 fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 sd4 st0 st1
makedev tty0 tty1 tty2 cd0 cd1 mcd0 ttyv0 opty ld0 ld1 ld2 ld3 ed0 ed1
diff -r d3502e392307 -r 0fec79bc6315 etc/etc.i386/Makefile.inc
--- a/etc/etc.i386/Makefile.inc Fri Mar 11 20:48:24 2005 +0000
+++ b/etc/etc.i386/Makefile.inc Fri Mar 11 20:55:10 2005 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile.inc,v 1.40 2004/07/23 17:57:41 tron Exp $
+# $NetBSD: Makefile.inc,v 1.41 2005/03/11 20:55:10 bouyer Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
KERNEL_SETS= GENERIC GENERIC_TINY GENERIC_LAPTOP \
GENERIC_DIAGNOSTIC GENERIC_PS2TINY GENERIC.MP \
- GENERIC.MPACPI
+ GENERIC.MPACPI XEN0 XENU
BUILD_KERNELS= INSTALL INSTALL_SMALL INSTALL_TINY \
- INSTALL_LAPTOP INSTALL_PS2
+ INSTALL_LAPTOP INSTALL_PS2 INSTALL_XENU
INSTALLATION_DIRS+= installation/misc \
installation/floppy
Home |
Main Index |
Thread Index |
Old Index