[Midnightbsd-cvs] src: src/cddl: what the hell..
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Oct 12 18:26:13 EDT 2008
Log Message:
-----------
what the hell.. let's throw in some preperation for zfs.
Added Files:
-----------
src/cddl:
Makefile (r1.1)
Makefile.inc (r1.1)
src/cddl/lib:
Makefile (r1.1)
Makefile.inc (r1.1)
src/cddl/lib/libavl:
Makefile (r1.1)
src/cddl/lib/libnvpair:
Makefile (r1.1)
src/cddl/lib/libumem:
Makefile (r1.1)
src/cddl/lib/libuutil:
Makefile (r1.1)
src/cddl/lib/libzfs:
Makefile (r1.1)
src/cddl/lib/libzpool:
Makefile (r1.1)
src/cddl/sbin:
Makefile (r1.1)
Makefile.inc (r1.1)
src/cddl/sbin/zfs:
Makefile (r1.1)
src/cddl/sbin/zpool:
Makefile (r1.1)
src/cddl/usr.bin:
Makefile (r1.1)
Makefile.inc (r1.1)
src/cddl/usr.bin/ztest:
Makefile (r1.1)
src/cddl/usr.sbin:
Makefile (r1.1)
Makefile.inc (r1.1)
src/cddl/usr.sbin/zdb:
Makefile (r1.1)
-------------- next part --------------
--- /dev/null
+++ cddl/usr.bin/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD: src/cddl/usr.bin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
+
+BINDIR?= /usr/bin
+
+.include "../Makefile.inc"
--- /dev/null
+++ cddl/usr.bin/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_ztest}
+
+.if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+_ztest= ztest
+.endif
+.endif
+
+.include <bsd.subdir.mk>
--- /dev/null
+++ cddl/lib/libzpool/Makefile
@@ -0,0 +1,50 @@
+# $FreeBSD: src/cddl/lib/libzpool/Makefile,v 1.5 2007/06/08 12:35:45 pjd Exp $
+
+.include "${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/Makefile.files"
+
+# ZFS_COMMON_SRCS
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
+# ZFS_SHARED_SRCS
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs
+# KERNEL_SRCS
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libzpool/common
+# LIST_SRCS
+.PATH: ${.CURDIR}/../../../sys/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}
+ATOMIC_SRCS= atomic.S
+.else
+.PATH: ${.CURDIR}/../../../sys/compat/opensolaris/kern
+ATOMIC_SRCS= opensolaris_atomic.c
+.endif
+
+LIB= zpool
+
+ZFS_COMMON_SRCS= ${ZFS_COMMON_OBJS:C/.o$/.c/} vdev_file.c
+ZFS_SHARED_SRCS= ${ZFS_SHARED_OBJS:C/.o$/.c/}
+KERNEL_SRCS= kernel.c taskq.c util.c
+LIST_SRCS= list.c
+
+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}/../../../cddl/lib/libumem
+CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+
+DPADD= ${LIBPTHREAD} ${LIBZ}
+LDADD= -lpthread -lz
+
+# atomic.S doesn't like profiling.
+NO_PROFILE=
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/sbin/zfs/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+
+.PATH: ${.CURDIR}/../../../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
+
+DPADD= ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD= -lzfs -lgeom -lbsdxml -lsbuf \
+ -lm -lnvpair -luutil -lutil
+
+.include <bsd.prog.mk>
--- /dev/null
+++ cddl/usr.bin/ztest/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+
+.PATH: ${.CURDIR}/../../../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}/../../lib/libumem
+
+DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
+
+.include <bsd.prog.mk>
--- /dev/null
+++ cddl/lib/libnvpair/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD: src/cddl/lib/libnvpair/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libnvpair
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/nvpair
+
+LIB= nvpair
+
+SRCS= libnvpair.c \
+ nvpair_alloc_system.c \
+ nvpair_alloc_fixed.c \
+ nvpair.c
+
+CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../include # XXX
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/usr.sbin/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD: src/cddl/usr.sbin/Makefile.inc,v 1.1 2007/04/06 01:08:58 pjd Exp $
+
+BINDIR?= /usr/sbin
+
+.include "../Makefile.inc"
--- /dev/null
+++ cddl/usr.sbin/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_zdb}
+
+.if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+_zdb= zdb
+.endif
+.endif
+
+.include <bsd.subdir.mk>
--- /dev/null
+++ cddl/sbin/Makefile.inc
@@ -0,0 +1,5 @@
+# $FreeBSD: src/cddl/sbin/Makefile.inc,v 1.1 2007/04/06 01:08:57 pjd Exp $
+
+BINDIR?= /sbin
+
+.include "../Makefile.inc"
--- /dev/null
+++ cddl/sbin/Makefile
@@ -0,0 +1,12 @@
+# $FreeBSD: src/cddl/sbin/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= ${_zfs} ${_zpool}
+
+.if ${MK_ZFS} != "no"
+_zfs= zfs
+_zpool= zpool
+.endif
+
+.include <bsd.subdir.mk>
--- /dev/null
+++ cddl/sbin/zpool/Makefile
@@ -0,0 +1,27 @@
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
+
+.PATH: ${.CURDIR}/../../../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
+
+DPADD= ${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+ ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD= -lavl -lzfs -lgeom -lbsdxml -lsbuf \
+ -lm -lnvpair -luutil -lutil
+
+.include <bsd.prog.mk>
--- /dev/null
+++ cddl/Makefile.inc
@@ -0,0 +1,3 @@
+# $MidnightBSD: src/cddl/Makefile.inc,v 1.1 2008/10/12 22:26:07 laffer1 Exp $
+
+CFLAGS+= -D_SOLARIS_C_SOURCE
--- /dev/null
+++ cddl/Makefile
@@ -0,0 +1,5 @@
+# $MidnightBSD: src/cddl/Makefile,v 1.1 2008/10/12 22:26:07 laffer1 Exp $
+
+SUBDIR= lib sbin usr.bin usr.sbin
+
+.include <bsd.subdir.mk>
--- /dev/null
+++ cddl/lib/Makefile.inc
@@ -0,0 +1,6 @@
+# $FreeBSD: src/cddl/lib/Makefile.inc,v 1.2 2007/04/16 21:20:24 ru Exp $
+
+SHLIBDIR?= /lib
+SHLIB_MAJOR?= 1
+
+.include "../Makefile.inc"
--- /dev/null
+++ cddl/lib/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD: src/cddl/lib/Makefile,v 1.7 2007/10/09 23:31:09 obrien Exp $
+
+.include <bsd.own.mk>
+
+SUBDIR= libavl \
+ libnvpair \
+ libumem \
+ libuutil \
+ ${_libzfs} \
+ ${_libzpool}
+
+.if ${MK_ZFS} != "no"
+_libzfs= libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBKSE} != "no"
+_libzpool= libzpool
+.endif
+.endif
+
+.include <bsd.subdir.mk>
--- /dev/null
+++ cddl/lib/libavl/Makefile
@@ -0,0 +1,10 @@
+# $FreeBSD: src/cddl/lib/libavl/Makefile,v 1.2 2007/04/16 21:20:24 ru Exp $
+
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+
+LIB= avl
+SRCS= avl.c
+CFLAGS+= -I${.CURDIR}/../../../sys/compat/opensolaris
+CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/lib/libumem/Makefile
@@ -0,0 +1,9 @@
+# $FreeBSD: src/cddl/lib/libumem/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+
+.PATH: ${.CURDIR}/../../../compat/opensolaris/lib/libumem
+
+LIB= umem
+SRCS= umem.c
+CFLAGS+= -I${.CURDIR}/../../../compat/opensolaris/lib/libumem
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/lib/libuutil/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD: src/cddl/lib/libuutil/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $
+
+.PATH: ${.CURDIR}/../../../contrib/opensolaris/lib/libuutil/common
+.PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/avl
+
+LIB= uutil
+SRCS= avl.c \
+ uu_alloc.c \
+ uu_avl.c \
+ uu_dprintf.c \
+ uu_ident.c \
+ uu_list.c \
+ uu_misc.c \
+ uu_open.c \
+ uu_pname.c \
+ 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
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/lib/libzfs/Makefile
@@ -0,0 +1,47 @@
+# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd 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
+
+LIB= zfs
+DPADD= ${LIBUTIL}
+LDADD= -lutil
+
+SRCS= deviceid.c \
+ mnttab.c \
+ mkdirp.c \
+ zmount.c \
+ fsshare.c \
+ zone.c
+
+SRCS+= zfs_namecheck.c \
+ zfs_prop.c \
+ libzfs_dataset.c \
+ libzfs_util.c \
+ libzfs_graph.c \
+ libzfs_mount.c \
+ libzfs_pool.c \
+ libzfs_changelist.c \
+ libzfs_config.c \
+ libzfs_import.c \
+ libzfs_status.c
+
+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
+
+.include <bsd.lib.mk>
--- /dev/null
+++ cddl/usr.sbin/zdb/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
+
+.PATH: ${.CURDIR}/../../../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}/../../lib/libumem
+
+DPADD= ${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+ ${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD= -lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
+
+.include <bsd.prog.mk>
More information about the Midnightbsd-cvs
mailing list