Pull up revisions (requested by bouyer in ticket #1087): netbsd-4
authorjdc <jdc@NetBSD.org>
Sun, 23 Mar 2008 10:32:04 +0000
branchnetbsd-4
changeset 262050 62e58ecb0391
parent 262049 b8bff149fcd2
child 262051 7d19ac324b46
Pull up revisions (requested by bouyer in ticket #1087): src/distrib/sets/lists/comp/md.i386 1.104 src/sys/arch/i386/Makefile 1.33 src/sys/arch/xen/include/Makefile 1.3 src/usr.bin/kdump/Makefile.ioctl-c 1.20 Install xenio.h and xenio3.h in /usr/include/xen, for the benefit of xentools3. XXX ignore those in Makefile.ioctl-c, they don't compile properly outside of the Xen context and the ioctls from xenio.h conflicts with soundcard.h
distrib/sets/lists/comp/md.i386
sys/arch/i386/Makefile
sys/arch/xen/include/Makefile
usr.bin/kdump/Makefile.ioctl-c
--- a/distrib/sets/lists/comp/md.i386	Sun Mar 23 10:26:05 2008 +0000
+++ b/distrib/sets/lists/comp/md.i386	Sun Mar 23 10:32:04 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.95 2006/07/26 20:09:17 drochner Exp $
+# $NetBSD: md.i386,v 1.95.4.1 2008/03/23 10:32:04 jdc Exp $
 ./usr/include/emmintrin.h			comp-c-include		gcccmds
 ./usr/include/i386				comp-c-include
 ./usr/include/i386/_G_config.h			comp-obsolete		obsolete
@@ -98,6 +98,9 @@
 ./usr/include/x86/psl.h				comp-c-include
 ./usr/include/x86/specialreg.h			comp-c-include
 ./usr/include/x86/trap.h			comp-c-include
+./usr/include/xen				comp-c-include
+./usr/include/xen/xenio.h			comp-c-include
+./usr/include/xen/xenio3.h			comp-c-include
 ./usr/include/xmmintrin.h			comp-c-include		gcccmds
 ./usr/lib/libi386.a				comp-c-lib
 ./usr/lib/libi386_p.a				comp-c-proflib		profile
--- a/sys/arch/i386/Makefile	Sun Mar 23 10:26:05 2008 +0000
+++ b/sys/arch/i386/Makefile	Sun Mar 23 10:32:04 2008 +0000
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.28 2006/11/12 22:44:00 dyoung Exp $
+#	$NetBSD: Makefile,v 1.28.2.1 2008/03/23 10:32:05 jdc Exp $
 
 # Makefile for i386 tags file and boot blocks
 
@@ -32,6 +32,6 @@
 	    (cd $$i && rm -f tags; ln -s ../tags tags); done
 
 
-SUBDIR=	compile include stand ../x86/include
+SUBDIR=	compile include stand ../x86/include ../xen/include
 
 .include <bsd.subdir.mk>
--- a/sys/arch/xen/include/Makefile	Sun Mar 23 10:26:05 2008 +0000
+++ b/sys/arch/xen/include/Makefile	Sun Mar 23 10:32:04 2008 +0000
@@ -1,3 +1,8 @@
-#	$NetBSD: Makefile,v 1.2 2005/12/11 12:19:48 christos Exp $
+#	$NetBSD: Makefile,v 1.2.24.1 2008/03/23 10:32:05 jdc Exp $
+
+
+INCSDIR= /usr/include/xen
+
+INCS=	xenio.h xenio3.h
 
 .include <bsd.kinc.mk>
--- a/usr.bin/kdump/Makefile.ioctl-c	Sun Mar 23 10:26:05 2008 +0000
+++ b/usr.bin/kdump/Makefile.ioctl-c	Sun Mar 23 10:32:04 2008 +0000
@@ -1,11 +1,11 @@
-#	$NetBSD: Makefile.ioctl-c,v 1.18 2006/08/27 20:31:26 christos Exp $
+#	$NetBSD: Makefile.ioctl-c,v 1.18.2.1 2008/03/23 10:32:05 jdc Exp $
 
 # NOTE: <bsd.own.mk> needs to be previously .included for NETBSDSRCDIR
 
 DEPFILEGLOB=	${DESTDIR}/usr/include/*/*.h ${DESTDIR}/usr/include/*/*/*.h
 
 .if !make(cleandir) && !make(obj) && !make(includes)
-DEPFILES != egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' ${DEPFILEGLOB}
+DEPFILES != egrep -l '(_IO\(|_IOR\(|_IOW\(|_IOWR\()' ${DEPFILEGLOB} | fgrep -v xenio
 .endif
 
 ${PROG}-ioctl.c: mkioctls Makefile ${DEPFILES}