PERFORCE change 140162 for review
John Birrell
jb at FreeBSD.org
Thu Apr 17 05:57:25 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=140162
Change 140162 by jb at jb_freebsd1 on 2008/04/17 05:57:18
IF7
Affected files ...
.. //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#4 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#3 integrate
.. //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/nfe/if_nfereg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#4 integrate
Differences ...
==== //depot/projects/dtrace7/src/cddl/lib/libavl/Makefile#3 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2.2.1 2008/04/17 04:59:16 jb Exp $
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= avl
SRCS= avl.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace7/src/cddl/lib/libnvpair/Makefile#4 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.3 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2.2.1 2008/04/17 04:59:16 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/nvpair
LIB= nvpair
@@ -10,8 +10,8 @@
nvpair_alloc_fixed.c \
nvpair.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../include # XXX
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace7/src/cddl/lib/libumem/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2.2.1 2008/04/17 04:59:17 jb Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
LIB= umem
SRCS= umem.c
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
.include <bsd.lib.mk>
==== //depot/projects/dtrace7/src/cddl/lib/libuutil/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2.2.1 2008/04/17 04:59:17 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/avl
LIB= uutil
SRCS= avl.c \
@@ -16,10 +16,10 @@
uu_strtoint.c
CFLAGS+= -DNATIVE_BUILD
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
.include <bsd.lib.mk>
==== //depot/projects/dtrace7/src/cddl/lib/libzfs/Makefile#3 (text+ko) ====
@@ -1,9 +1,9 @@
-# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $
-.PATH: ${.CURDIR}/../../../compat/opensolaris/misc
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+.PATH: ${.CURDIR}/../../../cddl/compat/opensolaris/misc
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
LIB= zfs
DPADD= ${LIBUTIL}
@@ -31,17 +31,17 @@
CFLAGS+= -DZFS_NO_ACL
CFLAGS+= -I${.CURDIR}/../../../sbin/mount
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
.include <bsd.lib.mk>
==== //depot/projects/dtrace7/src/cddl/lib/libzpool/Makefile#3 (text+ko) ====
@@ -1,21 +1,21 @@
-# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5.2.1 2008/04/17 04:59:17 jb Exp $
-.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
+.include "${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/Makefile.files"
# ZFS_COMMON_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
# ZFS_SHARED_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
# KERNEL_SRCS
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
# LIST_SRCS
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
-.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= atomic.S
.else
-.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
ATOMIC_SRCS= opensolaris_atomic.c
.endif
@@ -29,17 +29,17 @@
SRCS= ${ZFS_COMMON_SRCS} ${ZFS_SHARED_SRCS} \
${KERNEL_SRCS} ${LIST_SRCS} ${ATOMIC_SRCS}
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../../cddl/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
DPADD= ${LIBPTHREAD} ${LIBZ}
LDADD= -lpthread -lz
==== //depot/projects/dtrace7/src/cddl/sbin/zfs/Makefile#3 (text+ko) ====
@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zfs
PROG= zfs
MAN= zfs.8
SRCS= zfs_main.c zfs_iter.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
==== //depot/projects/dtrace7/src/cddl/sbin/zpool/Makefile#3 (text+ko) ====
@@ -1,23 +1,23 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3.2.1 2008/04/17 04:59:17 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zpool
PROG= zpool
MAN= zpool.8
SRCS= zpool_main.c zpool_vdev.c zpool_iter.c zpool_util.c
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libumem/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzfs/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libuutil/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libumem/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzfs/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libnvpair
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
==== //depot/projects/dtrace7/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ====
@@ -1,18 +1,18 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4.2.1 2008/04/17 04:59:18 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/ztest
PROG= ztest
NO_MAN=
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
==== //depot/projects/dtrace7/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ====
@@ -1,19 +1,19 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4.2.1 2008/04/17 04:59:18 jb Exp $
-.PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
+.PATH: ${.CURDIR}/../../../cddl/contrib/opensolaris/cmd/zdb
PROG= zdb
MAN= zdb.8
SRCS= zdb.c zdb_il.c
-CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/include
-CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
-CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
-CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/include
+CFLAGS+= -I${.CURDIR}/../../../cddl/compat/opensolaris/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/lib/libzpool/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common
+CFLAGS+= -I${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/sys
+CFLAGS+= -I${.CURDIR}/../../../cddl/contrib/opensolaris/head
CFLAGS+= -I${.CURDIR}/../../lib/libumem
DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
==== //depot/projects/dtrace7/src/release/doc/share/misc/dev.archlist.txt#4 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.100.2.2 2008/02/03 16:26:17 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.100.2.3 2008/04/17 04:27:44 brueffer Exp $
#
#
@@ -108,7 +108,6 @@
rum i386,amd64
safe i386,pc98,amd64
sbp i386,sparc64,ia64,amd64
-sf i386,pc98,ia64,amd64
sis i386,pc98,ia64,amd64
sk i386,sparc64,pc98,amd64
sn i386,amd64
==== //depot/projects/dtrace7/src/sys/dev/nfe/if_nfe.c#5 (text+ko) ====
@@ -21,7 +21,7 @@
/* Driver for NVIDIA nForce MCP Fast Ethernet and Gigabit Ethernet */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.21.2.4 2008/03/18 00:42:26 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nfe/if_nfe.c,v 1.21.2.5 2008/04/17 04:22:32 yongari Exp $");
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -242,6 +242,14 @@
"NVIDIA nForce MCP67 Networking Adapter"},
{PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP67_LAN4,
"NVIDIA nForce MCP67 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN1,
+ "NVIDIA nForce MCP73 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN2,
+ "NVIDIA nForce MCP73 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN3,
+ "NVIDIA nForce MCP73 Networking Adapter"},
+ {PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP73_LAN4,
+ "NVIDIA nForce MCP73 Networking Adapter"},
{0, 0, NULL}
};
@@ -460,6 +468,10 @@
case PCI_PRODUCT_NVIDIA_MCP67_LAN2:
case PCI_PRODUCT_NVIDIA_MCP67_LAN3:
case PCI_PRODUCT_NVIDIA_MCP67_LAN4:
+ case PCI_PRODUCT_NVIDIA_MCP73_LAN1:
+ case PCI_PRODUCT_NVIDIA_MCP73_LAN2:
+ case PCI_PRODUCT_NVIDIA_MCP73_LAN3:
+ case PCI_PRODUCT_NVIDIA_MCP73_LAN4:
sc->nfe_flags |= NFE_40BIT_ADDR | NFE_PWR_MGMT |
NFE_CORRECT_MACADDR | NFE_TX_FLOW_CTRL;
break;
==== //depot/projects/dtrace7/src/sys/dev/nfe/if_nfereg.h#2 (text+ko) ====
@@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10 2007/06/12 10:51:47 yongari Exp $
+ * $FreeBSD: src/sys/dev/nfe/if_nfereg.h,v 1.10.2.1 2008/04/17 04:22:32 yongari Exp $
*/
#define NFE_RX_RING_COUNT 256
@@ -300,6 +300,10 @@
#define PCI_PRODUCT_NVIDIA_MCP67_LAN2 0x054d
#define PCI_PRODUCT_NVIDIA_MCP67_LAN3 0x054e
#define PCI_PRODUCT_NVIDIA_MCP67_LAN4 0x054f
+#define PCI_PRODUCT_NVIDIA_MCP73_LAN1 0x07dc
+#define PCI_PRODUCT_NVIDIA_MCP73_LAN2 0x07dd
+#define PCI_PRODUCT_NVIDIA_MCP73_LAN3 0x07de
+#define PCI_PRODUCT_NVIDIA_MCP73_LAN4 0x07df
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN2 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN1
#define PCI_PRODUCT_NVIDIA_NFORCE3_LAN3 PCI_PRODUCT_NVIDIA_NFORCE2_400_LAN2
==== //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#4 (text+ko) ====
@@ -1,17 +1,18 @@
-# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.7 2007/11/28 22:58:09 jb Exp $
+# $FreeBSD: src/sys/modules/zfs/Makefile,v 1.6.2.1 2008/04/17 04:59:18 jb Exp $
KMOD= zfs
SRCS= vnode_if.h
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/acl
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/acl
SRCS+= acl_common.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/avl
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/avl
SRCS+= avl.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/nvpair
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/nvpair
SRCS+= nvpair.c
-.PATH: ${.CURDIR}/../../compat/opensolaris/kern
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
+SRCS+= opensolaris_kmem.c
SRCS+= opensolaris_kobj.c
SRCS+= opensolaris_kstat.c
SRCS+= opensolaris_misc.c
@@ -20,21 +21,29 @@
SRCS+= opensolaris_vfs.c
SRCS+= opensolaris_zone.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64"
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
+SRCS+= atomic.S
+.else
+.PATH: ${.CURDIR}/../../cddl/compat/opensolaris/kern
+SRCS+= opensolaris_atomic.c
+.endif
+
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs
SRCS+= gfs.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/os
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/os
SRCS+= callb.c
SRCS+= list.c
SRCS+= nvpair_alloc_system.c
SRCS+= taskq.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/rpc
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/rpc
SRCS+= xdr.c
SRCS+= xdr_array.c
SRCS+= xdr_mem.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
SRCS+= adler32.c
SRCS+= crc32.c
SRCS+= deflate.c
@@ -46,9 +55,9 @@
SRCS+= zmod_subr.c
SRCS+= zutil.c
-.PATH: ${.CURDIR}/../../contrib/opensolaris/common/zfs
-.include "${.CURDIR}/../../contrib/opensolaris/uts/common/Makefile.files"
-.PATH: ${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
+.include "${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/Makefile.files"
+.PATH: ${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
ZFS_SRCS= ${ZFS_OBJS:C/.o$/.c/}
SRCS+= ${ZFS_SRCS}
SRCS+= vdev_geom.c
@@ -67,13 +76,15 @@
CWARNFLAGS+=-Wno-unused
CWARNFLAGS+=-Wno-switch
-CFLAGS+=-I${.CURDIR}/../../compat/opensolaris
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/fs/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common/zmod
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/uts/common
+CFLAGS+=-D_SOLARIS_C_SOURCE
+
+CFLAGS+=-I${.CURDIR}/../../cddl/compat/opensolaris
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/fs/zfs
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common/zmod
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/uts/common
CFLAGS+=-I${.CURDIR}/../..
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common/zfs
-CFLAGS+=-I${.CURDIR}/../../contrib/opensolaris/common
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common/zfs
+CFLAGS+=-I${.CURDIR}/../../cddl/contrib/opensolaris/common
CFLAGS+=-I${.CURDIR}/../../../include
WARNS?=1
More information about the p4-projects
mailing list