diff --git a/zfs/lib/libumem/COPYING b/COPYING similarity index 100% rename from zfs/lib/libumem/COPYING rename to COPYING diff --git a/zfs/lib/libumem/COPYRIGHT b/COPYRIGHT similarity index 100% rename from zfs/lib/libumem/COPYRIGHT rename to COPYRIGHT diff --git a/GIT b/GIT index 027408690f..eea0b4e6a1 100644 --- a/GIT +++ b/GIT @@ -36,7 +36,7 @@ the latest version of TopGit which likely is not packaged nicely so you will need to build it from source. You can use Git to clone TopGit from the official site here and your all set: - > git clone http://repo.or.cz/w/topgit.git + > git clone git://repo.or.cz/w/topgit.git > make > make install # Default installs to $(HOME) diff --git a/META b/META deleted file mode 100644 index d43327990b..0000000000 --- a/META +++ /dev/null @@ -1,6 +0,0 @@ -Meta: 1 -Name: zfs -Branch: 1.0 -Version: 0.4.0 -Release: 1 -Release-Tags: relext diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 39f3fd0848..0000000000 --- a/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -AUTOMAKE_OPTIONS = foreign dist-zip - -SUBDIRS = doc scripts $(BUILDDIR) -CONFIG_CLEAN_FILES = aclocal.m4 config.guess config.sub -CONFIG_CLEAN_FILES += depcomp missing mkinstalldirs -EXTRA_DIST = autogen.sh - -.PHONY: quilt -quilt: .quilt-$(BUILDDIR) -autogen: .autogen-$(BUILDDIR) -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 diff --git a/zfs/lib/libumem/OPENSOLARIS.LICENSE b/OPENSOLARIS.LICENSE similarity index 99% rename from zfs/lib/libumem/OPENSOLARIS.LICENSE rename to OPENSOLARIS.LICENSE index 535dec222d..da23621dc8 100644 --- a/zfs/lib/libumem/OPENSOLARIS.LICENSE +++ b/OPENSOLARIS.LICENSE @@ -1,7 +1,6 @@ Unless otherwise noted, all files in this distribution are released -under the Common Development and Distribution License (CDDL), -Version 1.0 only. Exceptions are noted within the associated -source files. +under the Common Development and Distribution License (CDDL). +Exceptions are noted within the associated source files. -------------------------------------------------------------------- diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 72bba5b035..0000000000 --- a/autogen.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -aclocal -I config && -libtoolize --automake --copy -autoheader && -automake --add-missing --include-deps 2>/dev/null -autoconf -rm -rf autom4te.cache aclocal.m4 diff --git a/build/Makefile b/build/Makefile deleted file mode 100644 index f84b8e9ccf..0000000000 --- a/build/Makefile +++ /dev/null @@ -1 +0,0 @@ -obj-m := conftest.o diff --git a/config/Makefile.am b/config/Makefile.am deleted file mode 100644 index d1fde7bb45..0000000000 --- a/config/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -EXTRA_DIST = zfs-build.m4 -EXTRA_DIST = kernel user lustre - diff --git a/config/kernel.m4 b/config/kernel.m4 deleted file mode 100644 index a146a5f088..0000000000 --- a/config/kernel.m4 +++ /dev/null @@ -1,62 +0,0 @@ -dnl # -dnl # Default ZFS kernel configuration -dnl # -AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [ - dnl # Kernel build make options - dnl # KERNELMAKE_PARAMS="V=1" # Enable verbose module build - KERNELMAKE_PARAMS= - - dnl # Kernel build cpp flags - KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL " - KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" - - dnl # Required for pread() functionality an other GNU goodness - HOSTCFLAGS="$HOSTCFLAGS -ggdb -O2 -std=c99 " - HOSTCFLAGS="$HOSTCFLAGS -D_GNU_SOURCE -D__EXTENSIONS__ " - - dnl # XXX: Quiet warnings not covered by the gcc-* patches - dnl # XXX: Remove once all the warnings are resolved - HOSTCFLAGS="$HOSTCFLAGS -Wno-switch -Wno-unused -Wno-missing-braces " - HOSTCFLAGS="$HOSTCFLAGS -Wno-parentheses " - HOSTCFLAGS="$HOSTCFLAGS -Wno-uninitialized -fno-strict-aliasing " - - dnl # Expected defines not covered by zfs_config.h or spl_config.h - HOSTCFLAGS="$HOSTCFLAGS -DHAVE_SPL -D_POSIX_PTHREAD_SEMANTICS " - HOSTCFLAGS="$HOSTCFLAGS -D_FILE_OFFSET_BITS=64 " - HOSTCFLAGS="$HOSTCFLAGS -D_LARGEFILE64_SOURCE -D_REENTRANT " - HOSTCFLAGS="$HOSTCFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" " - - dnl # Expected default include path - HOSTCFLAGS="$HOSTCFLAGS -I$TOPDIR " - - if test "$kernelbuild" != "$kernelsrc"; then - KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$kernelbuild" - fi - - AC_SUBST(KERNELMAKE_PARAMS) - AC_SUBST(KERNELCPPFLAGS) - 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/libport/u8_textprep.c $LIBDIR/libport/ku8_textprep.c - 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/compress.c $LIBDIR/libzcommon/kcompress.c - ln -f -s $LIBDIR/libzcommon/list.c $LIBDIR/libzcommon/klist.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 -]) diff --git a/config/lustre.m4 b/config/lustre.m4 deleted file mode 100644 index eee871cf96..0000000000 --- a/config/lustre.m4 +++ /dev/null @@ -1,4 +0,0 @@ -dnl # -dnl # Default ZFS lustre configuration -dnl # -AC_DEFUN([ZFS_AC_CONFIG_LUSTRE], []) diff --git a/config/user.m4 b/config/user.m4 deleted file mode 100644 index 11187d422e..0000000000 --- a/config/user.m4 +++ /dev/null @@ -1,4 +0,0 @@ -dnl # -dnl # Default ZFS user configuration -dnl # -AC_DEFUN([ZFS_AC_CONFIG_USER], []) diff --git a/config/zfs-build.m4 b/config/zfs-build.m4 deleted file mode 100644 index 6df90696d3..0000000000 --- a/config/zfs-build.m4 +++ /dev/null @@ -1,387 +0,0 @@ -AC_DEFUN([ZFS_AC_KERNEL], [ - ver=`uname -r` - - AC_ARG_WITH([linux], - AS_HELP_STRING([--with-linux=PATH], - [Path to kernel source]), - [kernelsrc="$withval"; kernelbuild="$withval"]) - - AC_ARG_WITH(linux-obj, - AS_HELP_STRING([--with-linux-obj=PATH], - [Path to kernel build objects]), - [kernelbuild="$withval"]) - - AC_MSG_CHECKING([kernel source directory]) - if test -z "$kernelsrc"; then - kernelbuild= - sourcelink=/lib/modules/${ver}/source - buildlink=/lib/modules/${ver}/build - - if test -e $sourcelink; then - kernelsrc=`(cd $sourcelink; /bin/pwd)` - fi - if test -e $buildlink; then - kernelbuild=`(cd $buildlink; /bin/pwd)` - fi - if test -z "$kernelsrc"; then - kernelsrc=$kernelbuild - fi - if test -z "$kernelsrc" -o -z "$kernelbuild"; then - AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([ - *** Please specify the location of the kernel source - *** with the '--with-linux=PATH' option]) - fi - fi - - AC_MSG_RESULT([$kernelsrc]) - AC_MSG_CHECKING([kernel build directory]) - AC_MSG_RESULT([$kernelbuild]) - - AC_MSG_CHECKING([kernel source version]) - if test -r $kernelbuild/include/linux/version.h && - fgrep -q UTS_RELEASE $kernelbuild/include/linux/version.h; then - - kernsrcver=`(echo "#include "; - echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | - grep "^kernsrcver=" | cut -d \" -f 2` - - elif test -r $kernelbuild/include/linux/utsrelease.h && - fgrep -q UTS_RELEASE $kernelbuild/include/linux/utsrelease.h; then - - kernsrcver=`(echo "#include "; - echo "kernsrcver=UTS_RELEASE") | - cpp -I $kernelbuild/include | - grep "^kernsrcver=" | cut -d \" -f 2` - fi - - if test -z "$kernsrcver"; then - AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([ - *** Cannot determine the version of the linux kernel source. - *** Please prepare the kernel before running this script]) - fi - - AC_MSG_RESULT([$kernsrcver]) - - kmoduledir=${INSTALL_MOD_PATH}/lib/modules/$kernsrcver - LINUX=${kernelsrc} - LINUX_OBJ=${kernelbuild} - - AC_SUBST(LINUX) - AC_SUBST(LINUX_OBJ) - AC_SUBST(kmoduledir) -]) - -AC_DEFUN([ZFS_AC_SPL], [ - - AC_ARG_WITH([spl], - AS_HELP_STRING([--with-spl=PATH], - [Path to spl source]), - [splsrc="$withval"; splbuild="$withval"]) - - AC_ARG_WITH([spl-obj], - AS_HELP_STRING([--with-spl-obj=PATH], - [Path to spl build objects]), - [splbuild="$withval"]) - - - AC_MSG_CHECKING([spl source directory]) - if test -z "$splsrc"; then - splbuild= - sourcelink=/tmp/`whoami`/spl - buildlink=/tmp/`whoami`/spl - - if test -e $sourcelink; then - splsrc=`(cd $sourcelink; /bin/pwd)` - fi - if test -e $buildlink; then - splbuild=`(cd $buildlink; /bin/pwd)` - fi - if test -z "$splsrc"; then - splsrc=$splbuild - fi - fi - - if test -z "$splsrc" -o -z "$splbuild"; then - sourcelink=/lib/modules/${ver}/source - buildlink=/lib/modules/${ver}/build - - if test -e $sourcelink; then - splsrc=`(cd $sourcelink; /bin/pwd)` - fi - if test -e $buildlink; then - splbuild=`(cd $buildlink; /bin/pwd)` - fi - if test -z "$splsrc"; then - splsrc=$splbuild - fi - if test -z "$splsrc" -o -z "$splbuild"; then - AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([ - *** Please specify the location of the spl source - *** with the '--with-spl=PATH' option]) - fi - fi - - AC_MSG_RESULT([$splsrc]) - AC_MSG_CHECKING([spl build directory]) - AC_MSG_RESULT([$splbuild]) - - AC_MSG_CHECKING([spl source version]) - if test -r $splbuild/spl_config.h && - fgrep -q VERSION $splbuild/spl_config.h; then - - splsrcver=`(echo "#include "; - echo "splsrcver=VERSION") | - cpp -I $splbuild | - grep "^splsrcver=" | cut -d \" -f 2` - fi - - if test -z "$splsrcver"; then - AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([ - *** Cannot determine the version of the spl source. - *** Please prepare the spl source before running this script]) - fi - - AC_MSG_RESULT([$splsrcver]) - - AC_MSG_CHECKING([spl Module.symvers]) - if test -r $splbuild/modules/Module.symvers; then - splsymvers=$splbuild/modules/Module.symvers - elif test -r $kernelbuild/Module.symvers; then - splsymvers=$kernelbuild/Module.symvers - fi - - if test -z "$splsymvers"; then - AC_MSG_RESULT([Not found]) - AC_MSG_ERROR([ - *** Cannot find extra Module.symvers in the spl source. - *** Please prepare the spl source before running this script]) - fi - - AC_MSG_RESULT([$splsymvers]) - AC_SUBST(splsrc) - AC_SUBST(splsymvers) -]) - -AC_DEFUN([ZFS_AC_LICENSE], [ - AC_MSG_CHECKING([license]) - AC_MSG_RESULT([CDDL]) -dnl # AC_DEFINE([HAVE_GPL_ONLY_SYMBOLS], [1], -dnl # [Define to 1 if module is licensed under the GPL]) -]) - -AC_DEFUN([ZFS_AC_DEBUG], [ - AC_MSG_CHECKING([whether debugging is enabled]) - AC_ARG_ENABLE( [debug], - AS_HELP_STRING([--enable-debug], - [Enable generic debug support (default off)]), - [ case "$enableval" in - yes) zfs_ac_debug=yes ;; - no) zfs_ac_debug=no ;; - *) AC_MSG_RESULT([Error!]) - AC_MSG_ERROR([Bad value "$enableval" for --enable-debug]) ;; - esac ] - ) - if test "$zfs_ac_debug" = yes; then - AC_MSG_RESULT([yes]) - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG " - HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " - else - AC_MSG_RESULT([no]) - AC_DEFINE([NDEBUG], [1], - [Define to 1 to disable debug tracing]) - KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " - HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " - fi -]) - -AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ - SCRIPT_CONFIG=.script-config - rm -f ${SCRIPT_CONFIG} - echo "KERNELSRC=${LINUX}" >>${SCRIPT_CONFIG} - echo "KERNELBUILD=${LINUX_OBJ}" >>${SCRIPT_CONFIG} - echo "KERNELSRCVER=$kernsrcver" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} - echo "SPLSRC=$splsrc" >>${SCRIPT_CONFIG} - echo "SPLBUILD=$splbuild" >>${SCRIPT_CONFIG} - echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG} - echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} - echo "ZFSSRC=${TOPDIR}/src" >>${SCRIPT_CONFIG} - echo "ZFSBUILD=${ZFSDIR}" >>${SCRIPT_CONFIG} - echo >>${SCRIPT_CONFIG} - echo "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG} - echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} - echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} -]) - -AC_DEFUN([ZFS_AC_CONFIG], [ - - TOPDIR=`/bin/pwd` - BUILDDIR=$ZFS_META_NAME #+$zfsconfig - ZFSDIR=$TOPDIR/$BUILDDIR - LIBDIR=$ZFSDIR/lib - CMDDIR=$ZFSDIR/zcmd - UNAME=`uname -r | cut -d- -f1` - - AC_SUBST(UNAME) - AC_SUBST(TOPDIR) - AC_SUBST(BUILDDIR) - AC_SUBST(ZFSDIR) - AC_SUBST(LIBDIR) - AC_SUBST(CMDDIR) - AC_SUBST(UNAME) - - AC_ARG_WITH([zfs-config], - AS_HELP_STRING([--with-config=CONFIG], - [Config file 'kernel|user|lustre']), - [zfsconfig="$withval"]) - - AC_MSG_CHECKING([zfs config]) - AC_MSG_RESULT([$zfsconfig]); - - case "$zfsconfig" in - kernel) ZFS_AC_CONFIG_KERNEL ;; - user) ZFS_AC_CONFIG_USER ;; - lustre) ZFS_AC_CONFIG_LUSTRE ;; - *) - AC_MSG_RESULT([Error!]) - AC_MSG_ERROR([Bad value "$zfsconfig" for --with-config, - user kernel|user|lustre]) ;; - esac - - ZFS_AC_CONFIG_SCRIPT -]) - -dnl # -dnl # ZFS_LINUX_CONFTEST -dnl # -AC_DEFUN([ZFS_LINUX_CONFTEST], [ -cat >conftest.c <<_ACEOF -$1 -_ACEOF -]) - -dnl # -dnl # ZFS_LANG_PROGRAM(C)([PROLOGUE], [BODY]) -dnl # -m4_define([ZFS_LANG_PROGRAM], [ -$1 -int -main (void) -{ -dnl Do *not* indent the following line: there may be CPP directives. -dnl Don't move the `;' right after for the same reason. -$2 - ; - return 0; -} -]) - -dnl # -dnl # ZFS_LINUX_COMPILE_IFELSE / like AC_COMPILE_IFELSE -dnl # -AC_DEFUN([ZFS_LINUX_COMPILE_IFELSE], [ -m4_ifvaln([$1], [ZFS_LINUX_CONFTEST([$1])])dnl -rm -f build/conftest.o build/conftest.mod.c build/conftest.ko build/Makefile -echo "obj-m := conftest.o" >build/Makefile -dnl AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" -f $PWD/build/Makefile LINUXINCLUDE="-Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM SUBDIRS=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], -AS_IF([AC_TRY_COMMAND(cp conftest.c build && make [$2] CC="$CC" LINUXINCLUDE="-Iinclude -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM M=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])], - [$4], - [_AC_MSG_LOG_CONFTEST -m4_ifvaln([$5],[$5])dnl])dnl -rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl -]) - -dnl # -dnl # ZFS_LINUX_TRY_COMPILE like AC_TRY_COMPILE -dnl # -AC_DEFUN([ZFS_LINUX_TRY_COMPILE], - [ZFS_LINUX_COMPILE_IFELSE( - [AC_LANG_SOURCE([ZFS_LANG_PROGRAM([[$1]], [[$2]])])], - [modules], - [test -s build/conftest.o], - [$3], [$4]) -]) - -dnl # -dnl # ZFS_LINUX_CONFIG -dnl # -AC_DEFUN([ZFS_LINUX_CONFIG], - [AC_MSG_CHECKING([whether Linux was built with CONFIG_$1]) - ZFS_LINUX_TRY_COMPILE([ - #ifndef AUTOCONF_INCLUDED - #include - #endif - ],[ - #ifndef CONFIG_$1 - #error CONFIG_$1 not #defined - #endif - ],[ - AC_MSG_RESULT([yes]) - $2 - ],[ - AC_MSG_RESULT([no]) - $3 - ]) -]) - -dnl # -dnl # ZFS_CHECK_SYMBOL_EXPORT -dnl # check symbol exported or not -dnl # -AC_DEFUN([ZFS_CHECK_SYMBOL_EXPORT], - [AC_MSG_CHECKING([whether symbol $1 is exported]) - grep -q -E '[[[:space:]]]$1[[[:space:]]]' $LINUX/Module.symvers 2>/dev/null - rc=$? - if test $rc -ne 0; then - export=0 - for file in $2; do - grep -q -E "EXPORT_SYMBOL.*($1)" "$LINUX/$file" 2>/dev/null - rc=$? - if test $rc -eq 0; then - export=1 - break; - fi - done - if test $export -eq 0; then - AC_MSG_RESULT([no]) - $4 - else - AC_MSG_RESULT([yes]) - $3 - fi - else - AC_MSG_RESULT([yes]) - $3 - fi -]) - -dnl # -dnl # 2.6.x API change -dnl # bio_end_io_t uses 2 args (size was dropped from prototype) -dnl # -AC_DEFUN([ZFS_AC_2ARGS_BIO_END_IO_T], - [AC_MSG_CHECKING([whether bio_end_io_t wants 2 args]) - tmp_flags="$EXTRA_KCFLAGS" - EXTRA_KCFLAGS="-Werror" - ZFS_LINUX_TRY_COMPILE([ - #include - ],[ - void (*wanted_end_io)(struct bio *, int) = NULL; - bio_end_io_t *local_end_io; - - local_end_io = wanted_end_io; - ],[ - AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_2ARGS_BIO_END_IO_T, 1, - [bio_end_io_t wants 2 args]) - ],[ - AC_MSG_RESULT(no) - ]) - EXTRA_KCFLAGS="$tmp_flags" -]) diff --git a/config/zfs-meta.m4 b/config/zfs-meta.m4 deleted file mode 100644 index 7ec44a3fc3..0000000000 --- a/config/zfs-meta.m4 +++ /dev/null @@ -1,112 +0,0 @@ -dnl # -dnl # ZFS_AC_META -dnl # Read metadata from the META file. -dnl # -dnl # AUTHOR: -dnl # Chris Dunlap -dnl # -AC_DEFUN([ZFS_AC_META], [ - AC_MSG_CHECKING([metadata]) - - META="$srcdir/META" - _zfs_ac_meta_got_file=no - if test -f "$META"; then - _zfs_ac_meta_got_file=yes - - ZFS_META_NAME=_ZFS_AC_META_GETVAL([(?:NAME|PROJECT|PACKAGE)]); - if test -n "$ZFS_META_NAME"; then - AC_DEFINE_UNQUOTED([ZFS_META_NAME], ["$ZFS_META_NAME"], - [Define the project name.] - ) - AC_SUBST([ZFS_META_NAME]) - fi - - ZFS_META_VERSION=_ZFS_AC_META_GETVAL([VERSION]); - if test -n "$ZFS_META_VERSION"; then - AC_DEFINE_UNQUOTED([ZFS_META_VERSION], ["$ZFS_META_VERSION"], - [Define the project version.] - ) - AC_SUBST([ZFS_META_VERSION]) - fi - - ZFS_META_RELEASE=_ZFS_AC_META_GETVAL([RELEASE]); - if test -n "$ZFS_META_RELEASE"; then - AC_DEFINE_UNQUOTED([ZFS_META_RELEASE], ["$ZFS_META_RELEASE"], - [Define the project release.] - ) - AC_SUBST([ZFS_META_RELEASE]) - fi - - if test -n "$ZFS_META_NAME" -a -n "$ZFS_META_VERSION"; then - ZFS_META_ALIAS="$ZFS_META_NAME-$ZFS_META_VERSION" - test -n "$ZFS_META_RELEASE" && - ZFS_META_ALIAS="$ZFS_META_ALIAS-$ZFS_META_RELEASE" - AC_DEFINE_UNQUOTED([ZFS_META_ALIAS], - ["$ZFS_META_ALIAS"], - [Define the project alias string.] - ) - AC_SUBST([ZFS_META_ALIAS]) - fi - - ZFS_META_DATA=_ZFS_AC_META_GETVAL([DATE]); - if test -n "$ZFS_META_DATA"; then - AC_DEFINE_UNQUOTED([ZFS_META_DATA], ["$ZFS_META_DATA"], - [Define the project release date.] - ) - AC_SUBST([ZFS_META_DATA]) - fi - - ZFS_META_AUTHOR=_ZFS_AC_META_GETVAL([AUTHOR]); - if test -n "$ZFS_META_AUTHOR"; then - AC_DEFINE_UNQUOTED([ZFS_META_AUTHOR], ["$ZFS_META_AUTHOR"], - [Define the project author.] - ) - AC_SUBST([ZFS_META_AUTHOR]) - fi - - m4_pattern_allow([^LT_(CURRENT|REVISION|AGE)$]) - ZFS_META_LT_CURRENT=_ZFS_AC_META_GETVAL([LT_CURRENT]); - ZFS_META_LT_REVISION=_ZFS_AC_META_GETVAL([LT_REVISION]); - ZFS_META_LT_AGE=_ZFS_AC_META_GETVAL([LT_AGE]); - if test -n "$ZFS_META_LT_CURRENT" \ - -o -n "$ZFS_META_LT_REVISION" \ - -o -n "$ZFS_META_LT_AGE"; then - test -n "$ZFS_META_LT_CURRENT" || ZFS_META_LT_CURRENT="0" - test -n "$ZFS_META_LT_REVISION" || ZFS_META_LT_REVISION="0" - test -n "$ZFS_META_LT_AGE" || ZFS_META_LT_AGE="0" - AC_DEFINE_UNQUOTED([ZFS_META_LT_CURRENT], - ["$ZFS_META_LT_CURRENT"], - [Define the libtool library 'current' - version information.] - ) - AC_DEFINE_UNQUOTED([ZFS_META_LT_REVISION], - ["$ZFS_META_LT_REVISION"], - [Define the libtool library 'revision' - version information.] - ) - AC_DEFINE_UNQUOTED([ZFS_META_LT_AGE], ["$ZFS_META_LT_AGE"], - [Define the libtool library 'age' - version information.] - ) - AC_SUBST([ZFS_META_LT_CURRENT]) - AC_SUBST([ZFS_META_LT_REVISION]) - AC_SUBST([ZFS_META_LT_AGE]) - fi - fi - - AC_MSG_RESULT([$_zfs_ac_meta_got_file]) - ] -) - -AC_DEFUN([_ZFS_AC_META_GETVAL], - [`perl -n\ - -e "BEGIN { \\$key=shift @ARGV; }"\ - -e "next unless s/^\s*\\$key@<:@:=@:>@//i;"\ - -e "s/^((?:@<:@^'\"#@:>@*(?:(@<:@'\"@:>@)@<:@^\2@:>@*\2)*)*)#.*/\\@S|@1/;"\ - -e "s/^\s+//;"\ - -e "s/\s+$//;"\ - -e "s/^(@<:@'\"@:>@)(.*)\1/\\@S|@2/;"\ - -e "\\$val=\\$_;"\ - -e "END { print \\$val if defined \\$val; }"\ - '$1' $META`]dnl -) diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 2498656562..0000000000 --- a/configure.ac +++ /dev/null @@ -1,164 +0,0 @@ -# -# This file is part of the ZFS Linux port. -# -# Copyright (c) 2008 Lawrence Livermore National Security, LLC. -# Produced at Lawrence Livermore National Laboratory -# Written by: -# Brian Behlendorf , -# Herb Wartens , -# Jim Garlick -# LLNL-CODE-403049 -# -# CDDL HEADER START -# -# The contents of this file are subject to the terms of the -# Common Development and Distribution License, Version 1.0 only -# (the "License"). You may not use this file except in compliance -# with the License. -# -# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE -# or http://www.opensolaris.org/os/licensing. -# See the License for the specific language governing permissions -# and limitations under the License. -# -# When distributing Covered Code, include this CDDL HEADER in each -# file and include the License file at usr/src/OPENSOLARIS.LICENSE. -# If applicable, add the following below this CDDL HEADER, with the -# fields enclosed by brackets "[]" replaced with your own identifying -# information: Portions Copyright [yyyy] [name of copyright owner] -# -# CDDL HEADER END -# - -AC_INIT -AC_LANG(C) -ZFS_AC_META -AC_CONFIG_AUX_DIR([config]) -AC_CANONICAL_SYSTEM -AM_INIT_AUTOMAKE([$ZFS_META_NAME], [$ZFS_META_VERSION]) -AC_CONFIG_HEADERS([zfs_config.h]) -AM_MAINTAINER_MODE - -AC_PROG_INSTALL -AC_PROG_CC -AC_PROG_LIBTOOL - -zfsconfig=kernel -kernelsrc= -kernelbuild= -splsrc= -splbuild= - -ZFS_AC_KERNEL -ZFS_AC_SPL -ZFS_AC_CONFIG -ZFS_AC_LICENSE -ZFS_AC_DEBUG -ZFS_AC_2ARGS_BIO_END_IO_T - -# Check for needed userspace bits -AC_CHECK_HEADERS(sys/types.h sys/byteorder.h sys/isa_defs.h \ - sys/systeminfo.h sys/u8_textprep.h libdiskmgt.h) - -AC_CHECK_FUNCS(strlcat strlcpy strnlen issetugid setmntent getexecname) - -AC_CHECK_LIB([diskmgt], [libdiskmgt_error], - [AC_DEFINE([HAVE_LIBDISKMGT], 1, - [Define to 1 if 'libdiskmgt' library available])]) - -AC_CHECK_LIB([efi], [efi_alloc_and_init], - [AC_DEFINE([HAVE_LIBEFI], 1, - [Define to 1 if 'libefi' library available])]) - -AC_CHECK_LIB([share], [sa_init], - [AC_DEFINE([HAVE_LIBSHARE], 1, - [Define to 1 if 'libshare' library available])]) - -AC_EGREP_HEADER(ioctl, unistd.h, - [AC_DEFINE([HAVE_IOCTL_IN_UNISTD_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - -AC_EGREP_HEADER(ioctl, sys/ioctl.h, - [AC_DEFINE([HAVE_IOCTL_IN_SYS_IOCTL_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - -AC_EGREP_HEADER(ioctl, stropts.h, - [AC_DEFINE([HAVE_IOCTL_IN_STROPTS_H], 1, - [Define to 1 if ioctl() is defined in header file])]) - -AC_EGREP_HEADER(strcmp, strings.h, - [AC_DEFINE([HAVE_STRCMP_IN_STRINGS_H], 1, - [Define to 1 if strcmpl() is defined in header file])]) - -AC_EGREP_HEADER(sysinfo, sys/systeminfo.h, - [AC_DEFINE([HAVE_SYSINFO_IN_SYS_SYSTEMINFO_H], 1, - [Define to 1 if sysinfo() is defined in header file])]) - -#AC_DEFINE([HAVE_ZVOL], 1, ["Define to 1 to include ZVOL support"]) -#AC_DEFINE([HAVE_ZPL], 1, ["Define to 1 to include ZPL support"]) -#AC_DEFINE([WANT_FAKE_IOCTL], 1, ["Define to 1 to use fake ioctl() support"]) -#AC_DEFINE([HAVE_DM_INUSE_SWAP], 1, ["None"]) -#AC_DEFINE([HAVE_UNICODE], 1, ["None"]) -#AC_DEFINE([HAVE_INTTYPES], 1, [Define to 1 if unint16 defined in header file]) - -AC_CONFIG_FILES([ Makefile - config/Makefile - doc/Makefile - scripts/Makefile - zfs/Makefile - zfs/lib/libudmu/include/Makefile - zfs/lib/libudmu/Makefile - zfs/lib/Makefile - zfs/lib/libnvpair/include/sys/Makefile - zfs/lib/libnvpair/include/Makefile - zfs/lib/libnvpair/Makefile - zfs/lib/libsolcompat/sparc64/Makefile - zfs/lib/libsolcompat/Makefile - zfs/lib/libsolcompat/include/tsol/Makefile - zfs/lib/libsolcompat/include/sparc64/sys/Makefile - zfs/lib/libsolcompat/include/sparc64/Makefile - zfs/lib/libsolcompat/include/rpc/Makefile - zfs/lib/libsolcompat/include/i386/sys/Makefile - zfs/lib/libsolcompat/include/i386/Makefile - zfs/lib/libsolcompat/include/ia32/sys/Makefile - zfs/lib/libsolcompat/include/ia32/Makefile - zfs/lib/libsolcompat/include/amd64/sys/Makefile - zfs/lib/libsolcompat/include/amd64/Makefile - zfs/lib/libsolcompat/include/sys/sysevent/Makefile - zfs/lib/libsolcompat/include/sys/fm/Makefile - zfs/lib/libsolcompat/include/sys/Makefile - zfs/lib/libsolcompat/include/Makefile - zfs/lib/libsolcompat/i386/Makefile - zfs/lib/libsolcompat/amd64/Makefile - zfs/lib/libavl/include/sys/Makefile - zfs/lib/libavl/include/Makefile - zfs/lib/libavl/Makefile - zfs/lib/libuutil/include/Makefile - zfs/lib/libuutil/Makefile - zfs/lib/libzfs/include/Makefile - zfs/lib/libzfs/Makefile - zfs/lib/libumem/include/Makefile - zfs/lib/libumem/Makefile - zfs/lib/libumem/sys/Makefile - zfs/lib/libzcommon/include/Makefile - zfs/lib/libzcommon/include/sys/fm/fs/Makefile - zfs/lib/libzcommon/include/sys/fm/Makefile - zfs/lib/libzcommon/include/sys/Makefile - zfs/lib/libzcommon/include/sys/fs/Makefile - zfs/lib/libzcommon/Makefile - zfs/lib/libzpool/Makefile - zfs/lib/libport/include/sys/Makefile - zfs/lib/libport/include/Makefile - zfs/lib/libport/Makefile - zfs/lib/libdmu-ctl/include/sys/Makefile - zfs/lib/libdmu-ctl/include/Makefile - zfs/lib/libdmu-ctl/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 diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 07f6386f45..0000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = LEGAL diff --git a/scripts/Makefile.am b/scripts/Makefile.am deleted file mode 100644 index e708530758..0000000000 --- a/scripts/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -EXTRA_DIST = check.sh create-zpool.sh load-zfs.sh unload-zfs.sh -EXTRA_DIST += profile-kpios-disk.sh profile-kpios-pids.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.sh - diff --git a/zfs/Makefile.in b/zfs/Makefile.in deleted file mode 100644 index e0b30c8373..0000000000 --- a/zfs/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -subdir-m += lib -subdir-m += zcmd - -all: -# Make the exported SPL symbols available to this module. There -# is probably a better way to do this, but this will have to do -# for now... an option to modpost perhaps. - cp @splsymvers@ . - -# Kick off the kernel build system - $(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ modules - -install uninstall clean distclean maintainer-clean distdir: - $(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@ - -check: diff --git a/zfs/lib/Makefile.in b/zfs/lib/Makefile.in deleted file mode 100644 index 324270db95..0000000000 --- a/zfs/lib/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -subdir-m += libuutil # User space util support -subdir-m += libumem # User space memory support -subdir-m += libzfs # User space library support -subdir-m += libsolcompat # User space compatibility library - -subdir-m += libzpool # Kernel DMU/SPA -subdir-m += libdmu-ctl # Kernel control interface - -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 += libport # Kernel + user space linux support diff --git a/zfs/lib/libavl/Makefile.in b/zfs/lib/libavl/Makefile.in deleted file mode 100644 index 6b9d4d5401..0000000000 --- a/zfs/lib/libavl/Makefile.in +++ /dev/null @@ -1,31 +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@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += uavl.o diff --git a/zfs/lib/libavl/include/Makefile.in b/zfs/lib/libavl/include/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libavl/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libavl/include/sys/Makefile.in b/zfs/lib/libavl/include/sys/Makefile.in deleted file mode 100644 index 8149c3861f..0000000000 --- a/zfs/lib/libavl/include/sys/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = avl.h avl_impl.h diff --git a/zfs/lib/libdmu-ctl/Makefile.in b/zfs/lib/libdmu-ctl/Makefile.in deleted file mode 100644 index c4017b254c..0000000000 --- a/zfs/lib/libdmu-ctl/Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ -# NOTE: dctl_client.c, dctl_common.c, dctl_server.c, dctl_thrpool.c unused -# by kernel port. Potentially they should just be removed if we don't care -# able user space lustre intergration from this source base. - -# NOTE: For clarity this directly should simply be renamed libzpl and -# the full kernel implementation should be minimally stubbed out. - -subdir-m += include -DISTFILES = dctl_client.c dctl_common.c dctl_server.c dctl_thrpool.c -DISTFILES += dmu_send.c rrwlock.c zfs_acl.c zfs_ctldir.c -DISTFILES += zfs_dir.c zfs_fuid.c zfs_ioctl.c zfs_log.c zfs_replay.c -DISTFILES += zfs_rlock.c zfs_vfsops.c zfs_vnops.c zvol.c - -MODULE := zctl - -EXTRA_CFLAGS = @KERNELCPPFLAGS@ -EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include -EXTRA_CFLAGS += -I@LIBDIR@/libdmu-ctl/include -EXTRA_CFLAGS += -I@LIBDIR@/libavl/include -EXTRA_CFLAGS += -I@LIBDIR@/libport/include -EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include - -obj-m := ${MODULE}.o - -${MODULE}-objs += zvol.o # Volume emulation interface -${MODULE}-objs += zfs_ioctl.o # /dev/zfs_ioctl interface -${MODULE}-objs += zfs_vfsops.o -${MODULE}-objs += dmu_send.o diff --git a/zfs/lib/libdmu-ctl/include/Makefile.in b/zfs/lib/libdmu-ctl/include/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libdmu-ctl/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libdmu-ctl/include/sys/Makefile.in b/zfs/lib/libdmu-ctl/include/sys/Makefile.in deleted file mode 100644 index 8f97ae684e..0000000000 --- a/zfs/lib/libdmu-ctl/include/sys/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = dmu_ctl.h dmu_ctl_impl.h diff --git a/zfs/lib/libnvpair/Makefile.in b/zfs/lib/libnvpair/Makefile.in deleted file mode 100644 index 90599ca488..0000000000 --- a/zfs/lib/libnvpair/Makefile.in +++ /dev/null @@ -1,34 +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@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/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 diff --git a/zfs/lib/libnvpair/include/Makefile.in b/zfs/lib/libnvpair/include/Makefile.in deleted file mode 100644 index d92f7114c6..0000000000 --- a/zfs/lib/libnvpair/include/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -subdir-m += sys -DISTFILES = libnvpair.h diff --git a/zfs/lib/libnvpair/include/sys/Makefile.in b/zfs/lib/libnvpair/include/sys/Makefile.in deleted file mode 100644 index 4f970cea58..0000000000 --- a/zfs/lib/libnvpair/include/sys/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = nvpair.h nvpair_impl.h diff --git a/zfs/lib/libport/Makefile.in b/zfs/lib/libport/Makefile.in deleted file mode 100644 index 85bdc959ae..0000000000 --- a/zfs/lib/libport/Makefile.in +++ /dev/null @@ -1,37 +0,0 @@ -subdir-m += include -DISTFILES = port.c strlcat.c strlcpy.c strnlen.c u8_textprep.c - -MODULE := zport -LIBRARY := libzport - -# Compile as kernel module. Needed symlinks created for all -# k* objects created by top level configure script. - -EXTRA_CFLAGS = @KERNELCPPFLAGS@ -EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include -EXTRA_CFLAGS += -I@LIBDIR@/libport/include - -obj-m := ${MODULE}.o - -${MODULE}-objs += spl.o -${MODULE}-objs += ku8_textprep.o - -# 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@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libport/include - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += strlcpy.o -${LIBRARY}-objs += strlcat.o -${LIBRARY}-objs += strnlen.o -${LIBRARY}-objs += port.o -${LIBRARY}-objs += u8_textprep.o - diff --git a/zfs/lib/libport/include/Makefile.in b/zfs/lib/libport/include/Makefile.in deleted file mode 100644 index e65438354c..0000000000 --- a/zfs/lib/libport/include/Makefile.in +++ /dev/null @@ -1,4 +0,0 @@ -subdir-m += sys - -DISTFILES = fake_ioctl.h libdiskmgt.h libshare.h mntent.h stdlib.h -DISTFILES += string.h strings.h stropts.h unistd.h diff --git a/zfs/lib/libport/include/sys/Makefile.in b/zfs/lib/libport/include/sys/Makefile.in deleted file mode 100644 index 6472080e18..0000000000 --- a/zfs/lib/libport/include/sys/Makefile.in +++ /dev/null @@ -1,3 +0,0 @@ -DISTFILES = byteorder.h debug.h efi_partition.h ioctl.h isa_defs.h -DISTFILES += policy.h socket.h swap.h systeminfo.h systm.h time.h -DISTFILES += types.h u8_textprep.h u8_textprep_data.h diff --git a/zfs/lib/libsolcompat/Makefile.in b/zfs/lib/libsolcompat/Makefile.in deleted file mode 100644 index f139d1c5eb..0000000000 --- a/zfs/lib/libsolcompat/Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -subdir-m += amd64 i386 sparc64 include -DISTFILES = atomic_asm_weak.h gen_synonyms.h getmntany.c -DISTFILES += mkdirp.c synonyms.h tsd.h zone.c - -LIBRARY := libsolcompat - -# 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@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += getmntany.o -${LIBRARY}-objs += mkdirp.o -${LIBRARY}-objs += zone.o diff --git a/zfs/lib/libsolcompat/amd64/Makefile.in b/zfs/lib/libsolcompat/amd64/Makefile.in deleted file mode 100644 index d56b66f9df..0000000000 --- a/zfs/lib/libsolcompat/amd64/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = atomic.S diff --git a/zfs/lib/libsolcompat/i386/Makefile.in b/zfs/lib/libsolcompat/i386/Makefile.in deleted file mode 100644 index d56b66f9df..0000000000 --- a/zfs/lib/libsolcompat/i386/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = atomic.S diff --git a/zfs/lib/libsolcompat/include/Makefile.in b/zfs/lib/libsolcompat/include/Makefile.in deleted file mode 100644 index 34bea226cb..0000000000 --- a/zfs/lib/libsolcompat/include/Makefile.in +++ /dev/null @@ -1,4 +0,0 @@ -subdir-m += amd64 i386 ia32 rpc sparc64 sys tsol -DISTFILES = assert.h atomic.h devid.h dirent.h libc.h libdevinfo.h libgen.h -DISTFILES += mtlib.h priv.h stdarg.h stdio_ext.h strings.h ucred.h zone.h - diff --git a/zfs/lib/libsolcompat/include/amd64/Makefile.in b/zfs/lib/libsolcompat/include/amd64/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libsolcompat/include/amd64/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in b/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in deleted file mode 100644 index 0466e658fd..0000000000 --- a/zfs/lib/libsolcompat/include/amd64/sys/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -DISTFILES = asm_linkage.h - diff --git a/zfs/lib/libsolcompat/include/i386/Makefile.in b/zfs/lib/libsolcompat/include/i386/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libsolcompat/include/i386/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libsolcompat/include/i386/sys/Makefile.in b/zfs/lib/libsolcompat/include/i386/sys/Makefile.in deleted file mode 100644 index 0466e658fd..0000000000 --- a/zfs/lib/libsolcompat/include/i386/sys/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -DISTFILES = asm_linkage.h - diff --git a/zfs/lib/libsolcompat/include/ia32/Makefile.in b/zfs/lib/libsolcompat/include/ia32/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libsolcompat/include/ia32/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in b/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in deleted file mode 100644 index 0466e658fd..0000000000 --- a/zfs/lib/libsolcompat/include/ia32/sys/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -DISTFILES = asm_linkage.h - diff --git a/zfs/lib/libsolcompat/include/rpc/Makefile.in b/zfs/lib/libsolcompat/include/rpc/Makefile.in deleted file mode 100644 index 93e4aa2e9b..0000000000 --- a/zfs/lib/libsolcompat/include/rpc/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -DISTFILES = xdr.h - diff --git a/zfs/lib/libsolcompat/include/sparc64/Makefile.in b/zfs/lib/libsolcompat/include/sparc64/Makefile.in deleted file mode 100644 index 6611e4143d..0000000000 --- a/zfs/lib/libsolcompat/include/sparc64/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += sys diff --git a/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in b/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in deleted file mode 100644 index 0466e658fd..0000000000 --- a/zfs/lib/libsolcompat/include/sparc64/sys/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -DISTFILES = asm_linkage.h - diff --git a/zfs/lib/libsolcompat/include/sys/Makefile.in b/zfs/lib/libsolcompat/include/sys/Makefile.in deleted file mode 100644 index 0f353b99a7..0000000000 --- a/zfs/lib/libsolcompat/include/sys/Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ -subdir-m += fm sysevent -DISTFILES = acl.h acl_impl.h bitmap.h byteorder.h callb.h cmn_err.h cred.h -DISTFILES += dkio.h dklabel.h feature_tests.h file.h idmap.h int_limits.h -DISTFILES += int_types.h inttypes.h isa_defs.h kmem.h kstat.h mkdev.h mntent.h -DISTFILES += mntio.h mnttab.h modctl.h mount.h note.h param.h priv.h -DISTFILES += processor.h rctl.h sdt.h stack.h stat.h sunddi.h sysevent.h -DISTFILES += sysmacros.h time.h trap.h types.h types32.h uio.h utsname.h -DISTFILES += uuid.h va_list.h varargs.h vmem.h vtoc.h zone.h diff --git a/zfs/lib/libsolcompat/include/sys/fm/Makefile.in b/zfs/lib/libsolcompat/include/sys/fm/Makefile.in deleted file mode 100644 index 5b752c687a..0000000000 --- a/zfs/lib/libsolcompat/include/sys/fm/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = protocol.h util.h diff --git a/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in b/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in deleted file mode 100644 index 4938c56594..0000000000 --- a/zfs/lib/libsolcompat/include/sys/sysevent/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = eventdefs.h diff --git a/zfs/lib/libsolcompat/include/tsol/Makefile.in b/zfs/lib/libsolcompat/include/tsol/Makefile.in deleted file mode 100644 index 9f5ec08aa0..0000000000 --- a/zfs/lib/libsolcompat/include/tsol/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = label.h diff --git a/zfs/lib/libsolcompat/sparc64/Makefile.in b/zfs/lib/libsolcompat/sparc64/Makefile.in deleted file mode 100644 index d56b66f9df..0000000000 --- a/zfs/lib/libsolcompat/sparc64/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = atomic.S diff --git a/zfs/lib/libudmu/Makefile.in b/zfs/lib/libudmu/Makefile.in deleted file mode 100644 index 9603ee40b4..0000000000 --- a/zfs/lib/libudmu/Makefile.in +++ /dev/null @@ -1,22 +0,0 @@ -subdir-m += include -DISTFILES = Makefile.in udmu_util.c udmu.c - -LIBRARY := libudmu - -# Compile as kernel module unsupported for libudmu. - -# 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@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += udmu.o diff --git a/zfs/lib/libudmu/include/Makefile.in b/zfs/lib/libudmu/include/Makefile.in deleted file mode 100644 index 0ca2142542..0000000000 --- a/zfs/lib/libudmu/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = udmu.h udmu_util.h diff --git a/zfs/lib/libumem/Makefile.in b/zfs/lib/libumem/Makefile.in deleted file mode 100644 index 008748e7cf..0000000000 --- a/zfs/lib/libumem/Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ -subdir-m += include sys -DISTFILES = COPYING COPYRIGHT OPENSOLARIS.LICENSE README README-alpha TODO -DISTFILES += config.h envvar.c getpcstack.c init_lib.c misc.c misc.h -DISTFILES += sol_compat.h umem.c umem_agent_support.c umem_base.h -DISTFILES += umem_fail.c umem_fork.c umem_impl.h umem_update_thread.c -DISTFILES += vmem.c vmem_base.c vmem_base.h vmem_mmap.c vmem_sbrk.c -DISTFILES += vmem_stand.h - -LIBRARY := libumem - -# 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@/libumem -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libumem/sys - -HOSTLDFLAGS += -pthread -HOSTLDFLAGS += -ldl - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += envvar.o -${LIBRARY}-objs += getpcstack.o -${LIBRARY}-objs += init_lib.o -${LIBRARY}-objs += misc.o -${LIBRARY}-objs += umem.o -${LIBRARY}-objs += umem_agent_support.o -${LIBRARY}-objs += umem_fail.o -${LIBRARY}-objs += umem_fork.o -${LIBRARY}-objs += umem_update_thread.o -${LIBRARY}-objs += vmem.o -${LIBRARY}-objs += vmem_base.o -${LIBRARY}-objs += vmem_mmap.o -${LIBRARY}-objs += vmem_sbrk.o diff --git a/zfs/lib/libumem/README b/zfs/lib/libumem/README deleted file mode 100644 index 63ec2486d9..0000000000 --- a/zfs/lib/libumem/README +++ /dev/null @@ -1,23 +0,0 @@ -Portable libumem. -================ - -This is a port of Solaris libumem to non-Solaris systems. - -The port was made while integrating libumem with our Ecelerity MTA product, so -your initial experience will not be 100% out-of-the-box, because there is no -standalone configure script for the library at this time. (patches welcome!) - -In addition, since our deployment is threaded, we force the library into -threaded mode. - -While the library is itself stable (it's the memory allocator used by the -Solaris OS), the port may have a few rough edges. We're shipping umem with -Linux and Windows versions of our product as we have found it to be stable. - -We will continue to update this project as and when we make improvements, and -welcome third-party patches that improve the usability for everyone. - - -Wez Furlong, -OmniTI, Inc. - diff --git a/zfs/lib/libumem/README-alpha b/zfs/lib/libumem/README-alpha deleted file mode 100644 index 44573d8f23..0000000000 --- a/zfs/lib/libumem/README-alpha +++ /dev/null @@ -1,56 +0,0 @@ -This is the libumem package. -This document describes the actions needed to build the pre-release -or CVS version of the package. See end of file for copying conditions. - -* Introduction - - This is a *pre-release* version, and not ready for production use -yet. If you are taking source from CVS, you will need to have libtool, -automake, and autoconf installed to help contribute. See the chapter -`Building' for the detailed instructions. The script autogen.sh is -provided to help autoconfigure libumem from the cvs src. After you -run autogen.sh, there should be a file 'INSTALL' with (generic) -installation instructions. Package-specific installation instructions -are set forth in the file README. - - Please, note that the accompanying documentation may be inaccurate -or incomplete. The CVS history is the authoritative documentation of -all recent changes. - -Report bugs to (TODO: mailing list <>) - -* Checking Out the Sources - -The following instructions apply if you wish to obtain sources from -the CVS repository: - -To checkout the source tree from CVS issue the following command: - - cvs -z3 -d:pserver:anonymous@umem.cvs.sourceforge.net:/cvsroot/umem co \ - -P umem - - This will give you read-only access. If you think you need write access, -contact the mailing list. - -* Building - - In order to build this you will first need to have right versions -of autotools and some auxiliary GNU programs. At the time of this -writing these are: - - Package Version (>=) - ======== ============ - automake 1.4 - autoconf 2.50 - libtool 1.5.0 - - To prepare the package for building run autogen.sh. Then run -./configure with the desired options (See INSTALL and README for the -detailed instructions). Finally, run make. Notice that the first make -of the package should be made in the source directory. Subsequent -makes can use build directory different from the source one. - -* Copyright information: - -Please see COPYRIGHT and OPENSOLARIS.LICENSE for the copyright -and license details. diff --git a/zfs/lib/libumem/TODO b/zfs/lib/libumem/TODO deleted file mode 100644 index 81ab0c3a5d..0000000000 --- a/zfs/lib/libumem/TODO +++ /dev/null @@ -1,19 +0,0 @@ -To-do List for the Linux port of umem -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -* Autconf'ery for in "sol_compat.h". - -* Fix #define wreakage for THR_RETURN, THR_API in "sol_compat.h". - -* Replace use of Ecelerity's portable atomic locking header with something - equivalent in "sol_compat.h". - -* ec_debug_vprintf -> something else? - -* test suite. - -* static library support. - -* doxygen'ate the headers/code, to produce reference docs. - -* HAVE_DOT in Doxyfile.in should be detected by configure. diff --git a/zfs/lib/libumem/include/Makefile.in b/zfs/lib/libumem/include/Makefile.in deleted file mode 100644 index b16a5d217a..0000000000 --- a/zfs/lib/libumem/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = umem.h diff --git a/zfs/lib/libumem/sys/Makefile.in b/zfs/lib/libumem/sys/Makefile.in deleted file mode 100644 index eed2c31187..0000000000 --- a/zfs/lib/libumem/sys/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = vmem.h vmem_impl_user.h diff --git a/zfs/lib/libuutil/Makefile.in b/zfs/lib/libuutil/Makefile.in deleted file mode 100644 index 8931bd8500..0000000000 --- a/zfs/lib/libuutil/Makefile.in +++ /dev/null @@ -1,35 +0,0 @@ -subdir-m += include -DISTFILES = Makefile.in *.c - -LIBRARY := libuutil - -# 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@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -DNATIVE_BUILD - -HOSTLDFLAGS += -pthread -HOSTLDFLAGS += -lrt -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += uu_alloc.o -${LIBRARY}-objs += uu_avl.o -${LIBRARY}-objs += uu_dprintf.o -${LIBRARY}-objs += uu_ident.o -${LIBRARY}-objs += uu_list.o -${LIBRARY}-objs += uu_misc.o -${LIBRARY}-objs += uu_open.o -${LIBRARY}-objs += uu_pname.o -${LIBRARY}-objs += uu_strtoint.o diff --git a/zfs/lib/libuutil/include/Makefile.in b/zfs/lib/libuutil/include/Makefile.in deleted file mode 100644 index ff0ba14404..0000000000 --- a/zfs/lib/libuutil/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = libuutil.h libuutil_common.h libuutil_impl.h diff --git a/zfs/lib/libzcommon/Makefile.in b/zfs/lib/libzcommon/Makefile.in deleted file mode 100644 index 7a19291134..0000000000 --- a/zfs/lib/libzcommon/Makefile.in +++ /dev/null @@ -1,55 +0,0 @@ -subdir-m += include -DISTFILES = compress.c list.c zfs_comutil.c zfs_deleg.c zfs_namecheck.c -DISTFILES += zfs_prop.c zpool_prop.c zprop_common.c - -MODULE := zcommon -LIBRARY := libzcommon - -# Compile as kernel module. Needed symlinks created for all -# k* objects created by top level configure script. - -EXTRA_CFLAGS = @KERNELCPPFLAGS@ -EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include -EXTRA_CFLAGS += -I@LIBDIR@/libport/include -EXTRA_CFLAGS += -I@LIBDIR@/libavl/include -EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include - -obj-m := ${MODULE}.o - -${MODULE}-objs += spl.o -${MODULE}-objs += kzfs_deleg.o -${MODULE}-objs += kzfs_prop.o -${MODULE}-objs += kzprop_common.o -${MODULE}-objs += kcompress.o -${MODULE}-objs += klist.o -${MODULE}-objs += kzfs_namecheck.o -${MODULE}-objs += kzfs_comutil.o -${MODULE}-objs += kzpool_prop.o - -# 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@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include - -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += zfs_deleg.o -${LIBRARY}-objs += zfs_prop.o -${LIBRARY}-objs += zprop_common.o -${LIBRARY}-objs += compress.o -${LIBRARY}-objs += list.o -${LIBRARY}-objs += zfs_namecheck.o -${LIBRARY}-objs += zfs_comutil.o -${LIBRARY}-objs += zpool_prop.o diff --git a/zfs/lib/libzcommon/include/Makefile.in b/zfs/lib/libzcommon/include/Makefile.in deleted file mode 100644 index 69ab6afa2e..0000000000 --- a/zfs/lib/libzcommon/include/Makefile.in +++ /dev/null @@ -1,2 +0,0 @@ -subdir-m += sys -DISTFILES = zfs_comutil.h zfs_deleg.h zfs_namecheck.h zfs_prop.h diff --git a/zfs/lib/libzcommon/include/sys/Makefile.in b/zfs/lib/libzcommon/include/sys/Makefile.in deleted file mode 100644 index e73a05fcec..0000000000 --- a/zfs/lib/libzcommon/include/sys/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -subdir-m += fm fs - -DISTFILES = arc.h bplist.h compress.h dbuf.h dmu.h dmu_impl.h -DISTFILES += dmu_objset.h dmu_traverse.h dmu_tx.h dmu_zfetch.h -DISTFILES += dnode.h dsl_dataset.h dsl_deleg.h dsl_dir.h dsl_pool.h -DISTFILES += dsl_prop.h dsl_synctask.h list.h list_impl.h metaslab.h -DISTFILES += metaslab_impl.h refcount.h rprwlock.h rrwlock.h spa.h -DISTFILES += spa_boot.h spa_impl.h space_map.h txg.h txg_impl.h uberblock.h -DISTFILES += uberblock_impl.h unique.h vdev.h vdev_disk.h vdev_file.h -DISTFILES += vdev_impl.h zap.h zap_impl.h zap_leaf.h zfs_acl.h -DISTFILES += zfs_context.h zfs_context_user.h zfs_ctldir.h zfs_debug.h -DISTFILES += zfs_dir.h zfs_fuid.h zfs_i18n.h zfs_ioctl.h zfs_rlock.h -DISTFILES += zfs_vfsops.h zfs_znode.h zil.h zil_impl.h zio.h -DISTFILES += zio_checksum.h zio_compress.h zio_impl.h zvol.h diff --git a/zfs/lib/libzcommon/include/sys/fm/Makefile.in b/zfs/lib/libzcommon/include/sys/fm/Makefile.in deleted file mode 100644 index 0a4dc0223e..0000000000 --- a/zfs/lib/libzcommon/include/sys/fm/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -subdir-m += fs diff --git a/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in b/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in deleted file mode 100644 index cbfbe3c671..0000000000 --- a/zfs/lib/libzcommon/include/sys/fm/fs/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = zfs.h diff --git a/zfs/lib/libzcommon/include/sys/fs/Makefile.in b/zfs/lib/libzcommon/include/sys/fs/Makefile.in deleted file mode 100644 index cbfbe3c671..0000000000 --- a/zfs/lib/libzcommon/include/sys/fs/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = zfs.h diff --git a/zfs/lib/libzfs/Makefile.in b/zfs/lib/libzfs/Makefile.in deleted file mode 100644 index 4718bed00f..0000000000 --- a/zfs/lib/libzfs/Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -subdir-m += include -DISTFILES = libzfs_changelist.c libzfs_config.c libzfs_dataset.c -DISTFILES += libzfs_graph.c libzfs_import.c libzfs_mount.c libzfs_pool.c -DISTFILES += libzfs_sendrecv.c libzfs_status.c libzfs_util.c - -LIBRARY := libzfs - -# 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@/libzfs/include -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libdmu-ctl/include -HOSTCFLAGS += -I@LIBDIR@/libzpool # For existing fletcher.c hack - -HOSTLDFLAGS += -ldl -lm -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon - -hostprogs-y := zu -always := $(hostprogs-y) - -zu-objs := zu.o ${LIBRARY}.so - -${LIBRARY}-objs += libzfs_dataset.o # Interface for manipulating datasets -${LIBRARY}-objs += libzfs_pool.o # Interface for manipulating pools -${LIBRARY}-objs += libzfs_changelist.o # Support for property changes -${LIBRARY}-objs += libzfs_config.o # Interface for manipulating configuration -${LIBRARY}-objs += libzfs_graph.o # Support for dependent list for datasets -${LIBRARY}-objs += libzfs_import.o # Discover and import pools -${LIBRARY}-objs += libzfs_mount.o # Mount, unmount, and share datasets -${LIBRARY}-objs += libzfs_status.o # Status -${LIBRARY}-objs += libzfs_util.o # Misc support -${LIBRARY}-objs += libzfs_sendrecv.o diff --git a/zfs/lib/libzfs/include/Makefile.in b/zfs/lib/libzfs/include/Makefile.in deleted file mode 100644 index 23c0b471f1..0000000000 --- a/zfs/lib/libzfs/include/Makefile.in +++ /dev/null @@ -1 +0,0 @@ -DISTFILES = libzfs.h libzfs_impl.h diff --git a/zfs/lib/libzpool/Makefile.in b/zfs/lib/libzpool/Makefile.in deleted file mode 100644 index 440fd1cbca..0000000000 --- a/zfs/lib/libzpool/Makefile.in +++ /dev/null @@ -1,102 +0,0 @@ -# NOTE: kernel.c, taskq.c, util.c unused by kernel port. -# Potentially they should just be removed if we don't care -# able user space lustre intergration from this source base. - -DISTFILES = arc.c bplist.c dbuf.c dmu.c dmu_object.c dmu_objset.c -DISTFILES += dmu_traverse.c dmu_tx.c dmu_zfetch.c dnode.c dnode_sync.c -DISTFILES += dsl_dataset.c dsl_deleg.c dsl_dir.c dsl_pool.c dsl_prop.c -DISTFILES += dsl_synctask.c fletcher.c gzip.c kernel.c lzjb.c metaslab.c -DISTFILES += refcount.c sha256.c spa.c spa_boot.c spa_config.c spa_errlog.c -DISTFILES += spa_history.c spa_misc.c space_map.c taskq.c txg.c uberblock.c -DISTFILES += unique.c util.c vdev.c vdev_cache.c vdev_disk.c vdev_missing.c -DISTFILES += vdev_file.c vdev_label.c vdev_mirror.c vdev_queue.c vdev_raidz.c -DISTFILES += vdev_root.c zap.c zap_leaf.c zap_micro.c zfs_byteswap.c zfs_fm.c -DISTFILES += zfs_znode.c zil.c zio.c zio_checksum.c zio_compress.c zio_inject.c - -MODULE := zpool - -EXTRA_CFLAGS = @KERNELCPPFLAGS@ -EXTRA_CFLAGS += -I@LIBDIR@/libzcommon/include -EXTRA_CFLAGS += -I@LIBDIR@/libport/include -EXTRA_CFLAGS += -I@LIBDIR@/libavl/include -EXTRA_CFLAGS += -I@LIBDIR@/libnvpair/include - -obj-m := ${MODULE}.o - -# DMU (Data Management Unit) -${MODULE}-objs += dmu.o # Interfaces dmu core -${MODULE}-objs += dmu_objset.o # Interfaces dmu objset open/close/manipulate -${MODULE}-objs += dmu_object.o # Interfaces dmu alloc/free -${MODULE}-objs += txg.o # Transaction model control threads -${MODULE}-objs += dmu_tx.o # Interfaces dmu transaction create/manipulate -${MODULE}-objs += dnode.o # Open context object-level support -${MODULE}-objs += dnode_sync.o # Syncing context object-level support -${MODULE}-objs += dbuf.o # Buffer management support -${MODULE}-objs += dmu_zfetch.o # Data stream prefetch logic -${MODULE}-objs += refcount.o # Generic refcount support -#${MODULE}-objs += dmu_send.o # XXX missing: Snapshot send/received support - -# DSL (Dataset and Snapshot Layer) -${MODULE}-objs += dsl_dir.o # Namespace and management support -${MODULE}-objs += dsl_dataset.o # Interfaces snapshot/rollback/clone -${MODULE}-objs += dsl_pool.o # Pool-level support -${MODULE}-objs += dsl_prop.o # Property manipulation support -${MODULE}-objs += dsl_deleg.o # XXX: ? -${MODULE}-objs += dsl_synctask.o# XXX: ? -${MODULE}-objs += unique.o # Unique objset ID support - -# ZAP (ZFS Attribute Processor) -${MODULE}-objs += zap.o # Interfaces (fat) -${MODULE}-objs += zap_leaf.o # Low-level support -${MODULE}-objs += zap_micro.o # Interfaces (micro) - -# ZIL (ZFS Intent Log) -${MODULE}-objs += zil.o # Intent log - -# ARC (Adaptive Replacement Cache) -${MODULE}-objs += arc.o # Adaptive replacement cache - -# SPA (Storage Pool Allocator) -${MODULE}-objs += spa.o # Open/import/export/destroy support -${MODULE}-objs += spa_misc.o # Misc support (includes locking) -${MODULE}-objs += spa_config.o # Parse and update pool config data -${MODULE}-objs += spa_errlog.o # Log of persistent pool-wide data errors -${MODULE}-objs += spa_history.o # Command history support -${MODULE}-objs += spa_boot.o # Bootable root partitions -${MODULE}-objs += zfs_fm.o # Post reports of FMA consumption support - -# ZIO (ZFS I/O Pipeline) -${MODULE}-objs += zio.o # Interfaces zio core -${MODULE}-objs += zio_checksum.o# Generic checksum interface -${MODULE}-objs += fletcher.o # Fletcher 2 and 4 checksum algorithms -${MODULE}-objs += sha256.o # SHA256 checksum algorithms -${MODULE}-objs += zio_compress.o# Generic compression interface -${MODULE}-objs += lzjb.o # LZJB compression algorithm -${MODULE}-objs += gzip.o # GZIP compression algorithm -${MODULE}-objs += uberblock.o # Basic uberblock routines -${MODULE}-objs += bplist.o # Keeps track of list of block pointers -${MODULE}-objs += metaslab.o # Bulk of DVA translation -${MODULE}-objs += space_map.o # Keeps track of free space -${MODULE}-objs += zio_inject.o # Framework for persistent error injection - -# VDEV (Virtual Devices) -${MODULE}-objs += vdev.o # Interfaces vdev code -${MODULE}-objs += vdev_disk.o # Disk virtual device -${MODULE}-objs += vdev_file.o # File virtual device -${MODULE}-objs += vdev_mirror.o # N-Way mirroring -${MODULE}-objs += vdev_raidz.o # RAID-Z grouping -${MODULE}-objs += vdev_root.o # Top-level pseudo vdev -${MODULE}-objs += vdev_missing.o# Special device for import -${MODULE}-objs += vdev_label.o # Read/write indentifying label support -${MODULE}-objs += vdev_cache.o # Simple device-level caching for reads -${MODULE}-objs += vdev_queue.o # I/O scheduling algorithm for vdevs - -# ZPL (ZFS Posix Layer) -${MODULE}-objs += zfs_byteswap.o# Byteswap support for ZPL -${MODULE}-objs += zfs_znode.o # Vnode to znode mapping - -# Traversal -${MODULE}-objs += dmu_traverse.o# Traversal code - -# SPL (Solaris Porting Layer) -${MODULE}-objs += spl.o # Linux kernel glue and misc support diff --git a/zfs/zcmd/Makefile.in b/zfs/zcmd/Makefile.in deleted file mode 100644 index 23720a5c77..0000000000 --- a/zfs/zcmd/Makefile.in +++ /dev/null @@ -1,6 +0,0 @@ -subdir-m += zfs -subdir-m += zpool -#subdir-m += zdb -#subdir-m += ztest -#subdir-m += zdump -#subdir-m += zinject diff --git a/zfs/zcmd/zdb/Makefile.in b/zfs/zcmd/zdb/Makefile.in deleted file mode 100644 index 119b29767e..0000000000 --- a/zfs/zcmd/zdb/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -DISTFILES = Makefile.in zdb.c zdb_il.c - -CMD := zdb - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/zdb/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += zdb_il.o -${CMD}-objs += zdb.o # Core command diff --git a/zfs/zcmd/zdump/Makefile.in b/zfs/zcmd/zdump/Makefile.in deleted file mode 100644 index e9662462c7..0000000000 --- a/zfs/zcmd/zdump/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -DISTFILES = Makefile.in zdump.c - -CMD := zdump - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/zdump/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += zdump.o # Arg processing diff --git a/zfs/zcmd/zfs/Makefile.in b/zfs/zcmd/zfs/Makefile.in deleted file mode 100644 index 2d07982fbf..0000000000 --- a/zfs/zcmd/zfs/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -DISTFILES = Makefile.in zfs_iter.c zfs_main.c zfs_util.h zfs_iter.h - -CMD := zfs - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/zpool/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += zfs_main.o # Arg processing -${CMD}-objs += zfs_iter.o # Iterator support diff --git a/zfs/zcmd/zinject/Makefile.in b/zfs/zcmd/zinject/Makefile.in deleted file mode 100644 index 6ff89ac01d..0000000000 --- a/zfs/zcmd/zinject/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -DISTFILES = Makefile.in translate.c zinject.c zinject.h - -CMD := zinject - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/zinject/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += translate.o # Translation support -${CMD}-objs += zinject.o # Core command diff --git a/zfs/zcmd/zpool/Makefile.in b/zfs/zcmd/zpool/Makefile.in deleted file mode 100644 index c91593300c..0000000000 --- a/zfs/zcmd/zpool/Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ -DISTFILES = Makefile.in zpool_main.c zpool_iter.c zpool_util.c zpool_vdev.c zpool_util.h - -CMD := zpool - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/zpool/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += zpool_main.o # Arg processing -${CMD}-objs += zpool_iter.o # Iterator support -${CMD}-objs += zpool_util.o # Misc support -${CMD}-objs += zpool_vdev.o # Converts vdevs to nvlists for libzfs diff --git a/zfs/zcmd/ztest/Makefile.in b/zfs/zcmd/ztest/Makefile.in deleted file mode 100644 index af0719f610..0000000000 --- a/zfs/zcmd/ztest/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -DISTFILES = Makefile.in ztest.c - -CMD := ztest - -HOSTCFLAGS += @HOSTCFLAGS@ -HOSTCFLAGS += -I@CMDDIR@/ztest/ -HOSTCFLAGS += -I@LIBDIR@/libsolcompat/include -HOSTCFLAGS += -I@LIBDIR@/libport/include -HOSTCFLAGS += -I@LIBDIR@/libavl/include -HOSTCFLAGS += -I@LIBDIR@/libnvpair/include -HOSTCFLAGS += -I@LIBDIR@/libumem/include -HOSTCFLAGS += -I@LIBDIR@/libuutil/include -HOSTCFLAGS += -I@LIBDIR@/libzcommon/include -HOSTCFLAGS += -I@LIBDIR@/libzfs/include - -HOSTLDFLAGS += -lavl -L@LIBDIR@/libavl -HOSTLDFLAGS += -lnvpair -L@LIBDIR@/libnvpair -HOSTLDFLAGS += -lumem -L@LIBDIR@/libumem -HOSTLDFLAGS += -luutil -L@LIBDIR@/libuutil -HOSTLDFLAGS += -lzport -L@LIBDIR@/libport -HOSTLDFLAGS += -lsolcompat -L@LIBDIR@/libsolcompat -HOSTLDFLAGS += -lzcommon -L@LIBDIR@/libzcommon -HOSTLDFLAGS += -lzfs -L@LIBDIR@/libzfs - -# Additional shared library paths for executing binaries in-tree -export LD_RUN_PATH = @LIBDIR@/libavl:@LIBDIR@/libnvpair:@LIBDIR@/libumem:@LIBDIR@/libuutil:@LIBDIR@/libport:@LIBDIR@/libsolcompat:@LIBDIR@/libzcommon:@LIBDIR@/libzfs - -hostprogs-y := ${CMD} -always := $(hostprogs-y) - -${CMD}-objs += ztest.o # Core command -