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 2008-12-23 12:40:32 -08:00
parent 8cbdd41b72 9403f4a605
commit 2a403d2522
20 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -169,7 +169,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/Makefile.in
View File

@ -134,7 +134,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zdb/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zdump/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zfs/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zinject/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zpios/Makefile.in
View File

@ -146,7 +146,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/zpool/Makefile.in
View File

@ -152,7 +152,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
cmd/ztest/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
config/Makefile.in
View File

@ -126,7 +126,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

16
configure vendored
View File

@ -462,7 +462,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ kmoduledir splsrc splsymvers UNAME TOPDIR BUILDDIR ZFSDIR LIBDIR CMDDIR MODDIR KERNELMAKE_PARAMS KERNELCPPFLAGS HOSTCFLAGS LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ZFS_META_NAME ZFS_META_VERSION ZFS_META_RELEASE ZFS_META_ALIAS ZFS_META_DATA ZFS_META_AUTHOR ZFS_META_LT_CURRENT ZFS_META_LT_REVISION ZFS_META_LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL CCAS CCASFLAGS LINUX LINUX_OBJ kmoduledir splsrc splsymvers UNAME TOPDIR BUILDDIR LIBDIR CMDDIR MODDIR KERNELMAKE_PARAMS KERNELCPPFLAGS HOSTCFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
@ -19162,11 +19162,10 @@ echo "${ECHO_T}$splsymvers" >&6
TOPDIR=`/bin/pwd` TOPDIR=`/bin/pwd`
BUILDDIR=$ZFS_META_NAME BUILDDIR=$TOPDIR
ZFSDIR=$TOPDIR/$BUILDDIR LIBDIR=$TOPDIR/lib
LIBDIR=$ZFSDIR/lib CMDDIR=$TOPDIR/cmd
CMDDIR=$ZFSDIR/cmd MODDIR=$TOPDIR/module
MODDIR=$ZFSDIR/module
UNAME=`uname -r | cut -d- -f1` UNAME=`uname -r | cut -d- -f1`
@ -19178,7 +19177,6 @@ echo "${ECHO_T}$splsymvers" >&6
# Check whether --with-zfs-config or --without-zfs-config was given. # Check whether --with-zfs-config or --without-zfs-config was given.
if test "${with_zfs_config+set}" = set; then if test "${with_zfs_config+set}" = set; then
withval="$with_zfs_config" withval="$with_zfs_config"
@ -20039,9 +20037,6 @@ echo "$as_me: error: Bad value \"$zfsconfig\" for --with-config,
echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG} echo "SPLSRCVER=$splsrcver" >>${SCRIPT_CONFIG}
echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG} echo "SPLSYMVERS=$splsymvers" >>${SCRIPT_CONFIG}
echo >>${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 "TOPDIR=${TOPDIR}" >>${SCRIPT_CONFIG}
echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG} echo "LIBDIR=${LIBDIR}" >>${SCRIPT_CONFIG}
echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG} echo "CMDDIR=${CMDDIR}" >>${SCRIPT_CONFIG}
@ -20866,7 +20861,6 @@ s,@splsymvers@,$splsymvers,;t t
s,@UNAME@,$UNAME,;t t s,@UNAME@,$UNAME,;t t
s,@TOPDIR@,$TOPDIR,;t t s,@TOPDIR@,$TOPDIR,;t t
s,@BUILDDIR@,$BUILDDIR,;t t s,@BUILDDIR@,$BUILDDIR,;t t
s,@ZFSDIR@,$ZFSDIR,;t t
s,@LIBDIR@,$LIBDIR,;t t s,@LIBDIR@,$LIBDIR,;t t
s,@CMDDIR@,$CMDDIR,;t t s,@CMDDIR@,$CMDDIR,;t t
s,@MODDIR@,$MODDIR,;t t s,@MODDIR@,$MODDIR,;t t

1
doc/Makefile.in
View File

@ -125,7 +125,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/Makefile.in
View File

@ -134,7 +134,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libavl/Makefile.in
View File

@ -151,7 +151,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libnvpair/Makefile.in
View File

@ -152,7 +152,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libspl/Makefile.in
View File

@ -156,7 +156,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libuutil/Makefile.in
View File

@ -153,7 +153,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libzfs/Makefile.in
View File

@ -154,7 +154,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
lib/libzpool/Makefile.in
View File

@ -165,7 +165,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@

1
scripts/Makefile.in
View File

@ -125,7 +125,6 @@ STRIP = @STRIP@
TOPDIR = @TOPDIR@ TOPDIR = @TOPDIR@
UNAME = @UNAME@ UNAME = @UNAME@
VERSION = @VERSION@ VERSION = @VERSION@
ZFSDIR = @ZFSDIR@
ZFS_META_ALIAS = @ZFS_META_ALIAS@ ZFS_META_ALIAS = @ZFS_META_ALIAS@
ZFS_META_AUTHOR = @ZFS_META_AUTHOR@ ZFS_META_AUTHOR = @ZFS_META_AUTHOR@
ZFS_META_DATA = @ZFS_META_DATA@ ZFS_META_DATA = @ZFS_META_DATA@