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

This commit is contained in:
Brian Behlendorf 2008-12-11 14:04:17 -08:00
commit 37381659fc
22 changed files with 101 additions and 195 deletions

View File

@ -1,25 +1,9 @@
AUTOMAKE_OPTIONS = foreign dist-zip AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = autogen.sh AUTHORS COPYING COPYRIGHT ChangeLog DISCLAIMER
EXTRA_DIST += GIT META OPENSOLARIS.LICENSE README ZFS.RELEASE
SUBDIRS = doc scripts $(BUILDDIR) SUBDIRS = config doc scripts lib cmd module
CONFIG_CLEAN_FILES = aclocal.m4 config.guess config.sub
CONFIG_CLEAN_FILES += depcomp missing mkinstalldirs
EXTRA_DIST = autogen.sh
.PHONY: quilt .PHONY: rpm
quilt: .quilt-$(BUILDDIR) rpms: dist-bzip2
autogen: .autogen-$(BUILDDIR) rpmbuild -ta $(distdir).tar.bz2
config: .config-$(BUILDDIR)
.quilt-$(BUILDDIR):
./scripts/quilt.sh -p $(NAME) -b $(BUILDDIR) -s $(SERIESFILE) -d $(PATCHDIR)
echo $(BUILDDIR) >$@
unquilt:
rm -rf $(BUILDDIR)
rm -f .quilt-$(BUILDDIR)
clean-generic:
distclean: unquilt
rpms: dist Makefile
rpmbuild -ta $(distdir).tar.gz

View File

@ -1 +1 @@
EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 lustre.m4 user.m4 EXTRA_DIST = zfs-build.m4 zfs-meta.m4 kernel.m4 lustre.m4 user.m4 Rules.am

15
config/Rules.am Normal file
View File

@ -0,0 +1,15 @@
# Default build options
AM_FLAGS = -ggdb -O2 -std=c99
AM_FLAGS += -Wall -Wstrict-prototypes -Wshadow
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can.
AM_FLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
AM_FLAGS += -Wno-unknown-pragmas -Wno-parentheses
AM_FLAGS += -Wno-uninitialized -fno-strict-aliasing
# Expected defines not covered by zfs_config.h or spl_config.h
AM_FLAGS += -D_GNU_SOURCE -D__EXTENSIONS__
AM_FLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
AM_FLAGS += -D_LARGEFILE64_SOURCE -D_REENTRANT
AM_FLAGS += -DTEXT_DOMAIN=\\\"zfs-linux-user\\\"

View File

@ -37,24 +37,4 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
AC_SUBST(KERNELMAKE_PARAMS) AC_SUBST(KERNELMAKE_PARAMS)
AC_SUBST(KERNELCPPFLAGS) AC_SUBST(KERNELCPPFLAGS)
AC_SUBST(HOSTCFLAGS) AC_SUBST(HOSTCFLAGS)
dnl # XXX: I really, really hate this... but to ensure the kernel
dnl # build system compiles C files shared between a library and a
dnl # kernel module, we need to ensure each file has a unique make
dnl # target. To do that I'm creating symlinks for each shared
dnl # file at configure time. It may be possible something better
dnl # can be done in the Makefile but it will take some serious
dnl # investigation and I don't have the time now.
echo "creating symlinks for additional kernel make targets"
ln -f -s $LIBDIR/libavl/avl.c $LIBDIR/libavl/kavl.c
ln -f -s $LIBDIR/libavl/avl.c $LIBDIR/libavl/uavl.c
ln -f -s $LIBDIR/libnvpair/nvpair.c $LIBDIR/libnvpair/knvpair.c
ln -f -s $LIBDIR/libnvpair/nvpair.c $LIBDIR/libnvpair/unvpair.c
ln -f -s $LIBDIR/libzcommon/zfs_deleg.c $LIBDIR/libzcommon/kzfs_deleg.c
ln -f -s $LIBDIR/libzcommon/zfs_prop.c $LIBDIR/libzcommon/kzfs_prop.c
ln -f -s $LIBDIR/libzcommon/zprop_common.c $LIBDIR/libzcommon/kzprop_common.c
ln -f -s $LIBDIR/libzcommon/zfs_namecheck.c $LIBDIR/libzcommon/kzfs_namecheck.c
ln -f -s $LIBDIR/libzcommon/zfs_comutil.c $LIBDIR/libzcommon/kzfs_comutil.c
ln -f -s $LIBDIR/libzcommon/zpool_prop.c $LIBDIR/libzcommon/kzpool_prop.c
]) ])

View File

@ -105,34 +105,21 @@ AC_CONFIG_FILES([ Makefile
config/Makefile config/Makefile
doc/Makefile doc/Makefile
scripts/Makefile scripts/Makefile
zfs/Makefile lib/Makefile
zfs/lib/Makefile lib/libspl/Makefile
zfs/lib/libnvpair/include/sys/Makefile lib/libavl/Makefile
zfs/lib/libnvpair/include/Makefile lib/libnvpair/Makefile
zfs/lib/libnvpair/Makefile lib/libuutil/Makefile
zfs/lib/libavl/include/sys/Makefile lib/libzcommon/Makefile
zfs/lib/libavl/include/Makefile lib/libzpool/Makefile
zfs/lib/libavl/Makefile lib/libzfs/Makefile
zfs/lib/libuutil/include/Makefile lib/libzfs/include/Makefile
zfs/lib/libuutil/Makefile cmd/Makefile
zfs/lib/libzfs/include/Makefile cmd/zdb/Makefile
zfs/lib/libzfs/Makefile cmd/zdump/Makefile
zfs/lib/libzcommon/include/Makefile cmd/zfs/Makefile
zfs/lib/libzcommon/include/sys/fm/fs/Makefile cmd/zinject/Makefile
zfs/lib/libzcommon/include/sys/fm/Makefile cmd/zpool/Makefile
zfs/lib/libzcommon/include/sys/Makefile cmd/ztest/Makefile
zfs/lib/libzcommon/include/sys/fs/Makefile
zfs/lib/libzcommon/Makefile
zfs/lib/libzpool/Makefile
zfs/lib/libspl/include/sys/Makefile
zfs/lib/libspl/include/Makefile
zfs/lib/libspl/Makefile
zfs/zcmd/ztest/Makefile
zfs/zcmd/Makefile
zfs/zcmd/zfs/Makefile
zfs/zcmd/zdb/Makefile
zfs/zcmd/zinject/Makefile
zfs/zcmd/zdump/Makefile
zfs/zcmd/zpool/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

1
lib/Makefile.am Normal file
View File

@ -0,0 +1 @@
SUBDIRS = libspl libavl libnvpair libuutil libzcommon libzpool libzfs

10
lib/libavl/Makefile.am Normal file
View File

@ -0,0 +1,10 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${moddir}/avl/include \
-I${libdir}/libspl/include
lib_LTLIBRARIES = libavl.la
libavl_la_SOURCES = ${moddir}/avl/avl.c \
${moddir}/avl/include/sys/avl.h \
${moddir}/avl/include/sys/avl_impl.h

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

@ -0,0 +1,13 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${moddir}/nvpair/include \
-I${libdir}/libspl/include
lib_LTLIBRARIES = libnvpair.la
libnvpair_la_SOURCES = ${moddir}/nvpair/nvpair.c \
${libdir}/libnvpair/libnvpair.c \
${libdir}/libnvpair/nvpair_alloc_system.c \
${moddir}/nvpair/include/sys/nvpair.h \
${moddir}/nvpair/include/sys/nvpair_impl.h
${libdir}/libnvpair/include/libnvpair.h

14
lib/libspl/Makefile.am Normal file
View File

@ -0,0 +1,14 @@
include $(top_srcdir)/config/Rules.am
DEFAULT_INCLUDES = -I${libdir}/libspl/include
lib_LTLIBRARIES = libspl.la
libspl_la_SOURCES = list.c \
mkdirp.c \
strlcat.c \
strlcpy.c \
strnlen.c \
u8_textprep.c \
include/sys/list.h \
include/sys/list_impl.h

11
module/avl/Makefile.in Normal file
View File

@ -0,0 +1,11 @@
subdir-m += include
DISTFILES = avl.c
MODULE := zavl
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/avl/include
obj-m := ${MODULE}.o
${MODULE}-objs += avl.o # Generic AVL support

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

@ -0,0 +1,12 @@
subdir-m += include
DISTFILES = nvpair.c
MODULE := znvpair
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@MODDIR@/nvpair/include
obj-m := ${MODULE}.o
${MODULE}-objs += nvpair.o # Interfaces name/value pairs
${MODULE}-objs += nvpair_alloc_spl.o # Generic alloc/free support

View File

@ -1,8 +1,5 @@
EXTRA_DIST = check.sh create-zpool.sh load-zfs.sh unload-zfs.sh EXTRA_DIST = update-zfs.sh check.sh
EXTRA_DIST += profile-kpios-disk.sh profile-kpios-pids.sh EXTRA_DIST += load-zfs.sh unload-zfs.sh create-zpool.sh
EXTRA_DIST += profile-kpios-post.sh profile-kpios-pre.sh profile-kpios.sh
EXTRA_DIST += survey.sh update-zfs.sh zpios-jbod.sh zpios.sh
check: check:
./check.sh ./check.sh

View File

@ -1,8 +0,0 @@
subdir-m += libuutil # User space util support
subdir-m += libzfs # User space library support
subdir-m += libspl # User space compatibility library
subdir-m += libavl # Kernel &| User space AVL tree support
subdir-m += libnvpair # Kernel &| User space name/value support
subdir-m += libzcommon # Kernel &| User space common support
#subdir-m += libzpool # Kernel | User SPA/DMU/ZVOL/ZPL

View File

@ -1,30 +0,0 @@
subdir-m += include
DISTFILES = avl.c
MODULE := zavl
LIBRARY := libavl
# Compile as kernel module. Needed symlinks created for all
# k* objects created by top level configure script.
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@LIBDIR@/libavl/include
obj-m := ${MODULE}.o
${MODULE}-objs += kavl.o # Generic AVL support
# Compile as shared library. There's an extra useless host program
# here called 'zu' because it was the easiest way I could convince
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libavl/include
hostprogs-y := zu
always := $(hostprogs-y)
zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += uavl.o

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}

View File

@ -1,33 +0,0 @@
subdir-m += include
DISTFILES = libnvpair.c nvpair.c nvpair_alloc_fixed.c nvpair_alloc_system.c
MODULE := znvpair
LIBRARY := libnvpair
# Compile as kernel module. Needed symlinks created for all
# k* objects created by top level configure script.
EXTRA_CFLAGS = @KERNELCPPFLAGS@
EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include
obj-m := ${MODULE}.o
${MODULE}-objs += knvpair.o # Interfaces name/value pairs
${MODULE}-objs += nvpair_alloc_spl.o # Generic alloc/free support
# Compile as shared library. There's an extra useless host program
# here called 'zu' because it was the easiest way I could convince
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libspl/include
HOSTCFLAGS += -I@LIBDIR@/libnvpair/include
hostprogs-y := zu
always := $(hostprogs-y)
zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += unvpair.o
${LIBRARY}-objs += nvpair_alloc_system.o
${LIBRARY}-objs += libnvpair.o

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}

View File

@ -1,23 +0,0 @@
subdir-m += include
DISTFILES = list.c mkdirp.c strlcpy.c strlcat.c strnlen.c u8_textprep.c
LIBRARY := libspl
# Compile as shared library. There's an extra useless host program
# here called 'zu' because it was the easiest way I could convince
# the kernel build system to construct a user space shared library.
HOSTCFLAGS += @HOSTCFLAGS@
HOSTCFLAGS += -I@LIBDIR@/libspl/include
hostprogs-y := zu
always := $(hostprogs-y)
zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += mkdirp.o
${LIBRARY}-objs += strlcpy.o
${LIBRARY}-objs += list.o
${LIBRARY}-objs += strlcat.o
${LIBRARY}-objs += strnlen.o
${LIBRARY}-objs += u8_textprep.o

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}

View File

@ -1,4 +0,0 @@
int main(void)
{
return 0;
}