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

Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm

This commit is contained in:
Brian Behlendorf 2008-12-08 16:47:23 -08:00
parent f3dc5895ea acaaeda92a
commit 19b0553a19
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/update-zfs.sh
View File

@ -86,7 +86,6 @@ cp ${SRC_LIB}/libuutil/common/*.h ${DST_LIB}/libuutil/include/
echo "* zfs/lib/libspl" echo "* zfs/lib/libspl"
mkdir -p ${DST_LIB}/libspl/include/sys/ mkdir -p ${DST_LIB}/libspl/include/sys/
cp ${SRC_LIB}/libzpool/common/kernel.c ${DST_LIB}/libspl/
cp ${SRC_LIB}/libzpool/common/taskq.c ${DST_LIB}/libspl/ cp ${SRC_LIB}/libzpool/common/taskq.c ${DST_LIB}/libspl/
cp ${SRC_LIB}/libzpool/common/util.c ${DST_LIB}/libspl/ cp ${SRC_LIB}/libzpool/common/util.c ${DST_LIB}/libspl/
cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h ${DST_LIB}/libspl/include/sys/ cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h ${DST_LIB}/libspl/include/sys/
@ -110,6 +109,7 @@ cp ${SRC_UCM}/sys/fm/fs/zfs.h ${DST_LIB}/libzcommon/include/sys/fm/fs/
echo "* zfs/lib/libzpool" echo "* zfs/lib/libzpool"
mkdir -p ${DST_LIB}/libzpool/include/sys/ mkdir -p ${DST_LIB}/libzpool/include/sys/
cp ${SRC_LIB}/libzpool/common/kernel.c ${DST_LIB}/libzpool/
cp ${SRC_ZLIB}/*.c ${DST_LIB}/libzpool/ cp ${SRC_ZLIB}/*.c ${DST_LIB}/libzpool/
cp ${SRC_UTS}/intel/zfs/spa_boot.c ${DST_LIB}/libzpool/ cp ${SRC_UTS}/intel/zfs/spa_boot.c ${DST_LIB}/libzpool/
cp ${SRC_ZLIB}/sys/*.h ${DST_LIB}/libzpool/include/sys/ cp ${SRC_ZLIB}/sys/*.h ${DST_LIB}/libzpool/include/sys/

3
zfs/lib/libspl/Makefile.in
View File

@ -1,5 +1,5 @@
subdir-m += include subdir-m += include
DISTFILES = kernel.c mkdirp.c strlcpy.c taskq.c util.c DISTFILES = mkdirp.c strlcpy.c taskq.c util.c
DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c DISTFILES += list.c strlcat.c strnlen.c u8_textprep.c
LIBRARY := libzport LIBRARY := libzport
@ -17,7 +17,6 @@ always := $(hostprogs-y)
zu-objs := zu.o ${LIBRARY}.so zu-objs := zu.o ${LIBRARY}.so
${LIBRARY}-objs += kernel.o
${LIBRARY}-objs += mkdirp.o ${LIBRARY}-objs += mkdirp.o
${LIBRARY}-objs += strlcpy.o ${LIBRARY}-objs += strlcpy.o
${LIBRARY}-objs += taskq.o ${LIBRARY}-objs += taskq.o

4
zfs/lib/libzpool/Makefile.in
View File

@ -93,5 +93,5 @@ ${MODULE}-objs += zfs_znode.o # Vnode to znode mapping
# Traversal # Traversal
${MODULE}-objs += dmu_traverse.o# Traversal code ${MODULE}-objs += dmu_traverse.o# Traversal code
# SPL (Solaris Porting Layer) # Kernel or User Space Integration
${MODULE}-objs += spl.o # Linux kernel glue and misc support ${MODULE}-objs += kernel.o # Linux kernel/user glue and misc support