Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/top' into top

This commit is contained in:
Brian Behlendorf 2009-01-05 12:48:05 -08:00
parent c52e5a2cbb 1f02aaba1c
commit e4cf165c5f
20 changed files with 69 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/zdb/Makefile.am
View File

@ -8,7 +8,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zdb
@ -20,6 +21,7 @@ zdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

5
cmd/zdb/Makefile.in
View File

@ -63,6 +63,7 @@ zdb_OBJECTS = $(am_zdb_OBJECTS)
zdb_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
@ -217,7 +218,8 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
@ -240,6 +242,7 @@ zdb_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zfs/Makefile.am
View File

@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zfs
@ -21,6 +22,7 @@ zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

5
cmd/zfs/Makefile.in
View File

@ -63,6 +63,7 @@ zfs_OBJECTS = $(am_zfs_OBJECTS)
zfs_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
@ -216,7 +217,8 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
@ -241,6 +243,7 @@ zfs_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zinject/Makefile.am
View File

@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zinject
@ -23,6 +24,7 @@ zinject_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

5
cmd/zinject/Makefile.in
View File

@ -63,6 +63,7 @@ zinject_OBJECTS = $(am_zinject_OBJECTS)
zinject_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
@ -218,7 +219,8 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/zfs -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
@ -242,6 +244,7 @@ zinject_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

4
cmd/zpool/Makefile.am
View File

@ -7,7 +7,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = zpool
@ -22,6 +23,7 @@ zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

5
cmd/zpool/Makefile.in
View File

@ -64,6 +64,7 @@ zpool_OBJECTS = $(am_zpool_OBJECTS)
zpool_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
@ -217,7 +218,8 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/lib/libnvpair/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
@ -243,6 +245,7 @@ zpool_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

4
cmd/ztest/Makefile.am
View File

@ -10,7 +10,8 @@ DEFAULT_INCLUDES += \
-I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
sbin_PROGRAMS = ztest
@ -21,6 +22,7 @@ ztest_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

5
cmd/ztest/Makefile.in
View File

@ -63,6 +63,7 @@ ztest_OBJECTS = $(am_ztest_OBJECTS)
ztest_DEPENDENCIES = $(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la
@ -218,7 +219,8 @@ DEFAULT_INCLUDES = -I${top_srcdir} -I${top_srcdir}/lib/libspl/include \
-I${top_srcdir}/module/zfs -I${top_srcdir}/module/zfs/include \
-I${top_srcdir}/module/zcommon/include \
-I${top_srcdir}/module/nvpair/include \
-I${top_srcdir}/module/avl/include
-I${top_srcdir}/module/avl/include \
-I${top_srcdir}/module/unicode/include
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
@ -240,6 +242,7 @@ ztest_LDADD = \
$(top_builddir)/lib/libspl/libspl.la \
$(top_builddir)/lib/libavl/libavl.la \
$(top_builddir)/lib/libnvpair/libnvpair.la \
$(top_builddir)/lib/libunicode/libunicode.la \
$(top_builddir)/lib/libuutil/libuutil.la \
$(top_builddir)/lib/libzpool/libzpool.la \
$(top_builddir)/lib/libzfs/libzfs.la

2
lib/Makefile.am
View File

@ -1 +1 @@
SUBDIRS = libspl libavl libnvpair libuutil libzfs libzpool
SUBDIRS = libspl libavl libnvpair libunicode libuutil libzfs libzpool

2
lib/Makefile.in
View File

@ -193,7 +193,7 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = libspl libavl libnvpair libuutil libzfs libzpool
SUBDIRS = libspl libavl libnvpair libunicode libuutil libzfs libzpool
all: all-recursive
.SUFFIXES:

13
lib/libspl/Makefile.in
View File

@ -65,8 +65,8 @@ libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libspl_la_LIBADD =
am_libspl_la_OBJECTS = getexecname.lo gethrtime.lo getmntany.lo \
list.lo mkdirp.lo strlcat.lo strlcpy.lo strnlen.lo \
u8_textprep.lo zone.lo atomic.lo
list.lo mkdirp.lo strlcat.lo strlcpy.lo strnlen.lo zone.lo \
atomic.lo
libspl_la_OBJECTS = $(am_libspl_la_OBJECTS)
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@ -243,7 +243,6 @@ libspl_la_SOURCES = \
${top_srcdir}/lib/libspl/strlcat.c \
${top_srcdir}/lib/libspl/strlcpy.c \
${top_srcdir}/lib/libspl/strnlen.c \
${top_srcdir}/lib/libspl/u8_textprep.c \
${top_srcdir}/lib/libspl/zone.c \
${top_srcdir}/lib/libspl/asm-${target_cpu}/atomic.S \
${top_srcdir}/lib/libspl/include/sys/list.h \
@ -326,7 +325,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcat.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strlcpy.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strnlen.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u8_textprep.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zone.Plo@am__quote@
.S.o:
@ -418,13 +416,6 @@ strnlen.lo: ${top_srcdir}/lib/libspl/strnlen.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o strnlen.lo `test -f '${top_srcdir}/lib/libspl/strnlen.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/strnlen.c
u8_textprep.lo: ${top_srcdir}/lib/libspl/u8_textprep.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT u8_textprep.lo -MD -MP -MF "$(DEPDIR)/u8_textprep.Tpo" -c -o u8_textprep.lo `test -f '${top_srcdir}/lib/libspl/u8_textprep.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/u8_textprep.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/u8_textprep.Tpo" "$(DEPDIR)/u8_textprep.Plo"; else rm -f "$(DEPDIR)/u8_textprep.Tpo"; exit 1; fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='${top_srcdir}/lib/libspl/u8_textprep.c' object='u8_textprep.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o u8_textprep.lo `test -f '${top_srcdir}/lib/libspl/u8_textprep.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/u8_textprep.c
zone.lo: ${top_srcdir}/lib/libspl/zone.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT zone.lo -MD -MP -MF "$(DEPDIR)/zone.Tpo" -c -o zone.lo `test -f '${top_srcdir}/lib/libspl/zone.c' || echo '$(srcdir)/'`${top_srcdir}/lib/libspl/zone.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/zone.Tpo" "$(DEPDIR)/zone.Plo"; else rm -f "$(DEPDIR)/zone.Tpo"; exit 1; fi

13
lib/libunicode/Makefile.am Normal file
View File

@ -0,0 +1,13 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES += \
-I${top_srcdir}/module/unicode/include \
-I${top_srcdir}/lib/libspl/include
lib_LTLIBRARIES = libunicode.la
libunicode_la_SOURCES = \
${top_srcdir}/module/unicode/u8_textprep.c \
${top_srcdir}/module/unicode/uconv.c \
${top_srcdir}/module/unicode/include/sys/u8_textprep.h \
${top_srcdir}/module/unicode/include/sys/u8_textprep_data.h

2
module/Makefile.in
View File

@ -1,4 +1,4 @@
subdir-m = avl nvpair zcommon zfs zpios
subdir-m = avl nvpair unicode zcommon zfs zpios
# Make the exported SPL symbols available to these modules.
# Unfortunately there is not a cleaner way to do this, modpost

12
module/unicode/Makefile.in Normal file
View File

@ -0,0 +1,12 @@
subdir-m += include
DISTFILES = u8_textprep.c uconv.c
MODULE := zunicode
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
obj-m := ${MODULE}.o
${MODULE}-objs += u8_textprep.o
${MODULE}-objs += uconv.o

1
module/unicode/include/Makefile.in Normal file
View File

@ -0,0 +1 @@
subdir-m += sys

1
module/unicode/include/sys/Makefile.in Normal file
View File

@ -0,0 +1 @@
DISTFILES = u8_textprep.h u8_textprep_data.h

1
module/zcommon/Makefile.in
View File

@ -7,6 +7,7 @@ MODULE := zcommon
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/zfs/include

1
module/zfs/Makefile.in
View File

@ -16,6 +16,7 @@ EXTRA_CFLAGS += -I@MODDIR@/zfs/include
EXTRA_CFLAGS += -I@MODDIR@/zcommon/include
EXTRA_CFLAGS += -I@MODDIR@/avl/include
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
EXTRA_CFLAGS += -I@MODDIR@/unicode/include
obj-m := ${MODULE}.o