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

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

This commit is contained in:
Brian Behlendorf 2008-12-09 14:17:32 -08:00
parent a788f2891c 19f58048cb
commit 7410d21dc7
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
scripts/update-zfs.sh
View File

@ -73,11 +73,11 @@ cp ${SRC_UCM}/sys/nvpair.h ${DST_LIB}/libnvpair/include/sys/
cp ${SRC_UCM}/sys/nvpair_impl.h ${DST_LIB}/libnvpair/include/sys/
echo "* zfs/lib/libumem"
mkdir -p ${DST_LIB}/libumem/include/
mkdir -p ${DST_LIB}/libumem/sys/
mkdir -p ${DST_LIB}/libumem/include/sys/
cp ${SRC_LIB}/libumem/common/*.c ${DST_LIB}/libumem/
cp ${SRC_LIB}/libumem/common/*.h ${DST_LIB}/libumem/include/
cp ${SRC_LIB}/libumem/common/sys/*.h ${DST_LIB}/libumem/sys/
cp ${SRC_LIB}/libumem/common/sys/*.h ${DST_LIB}/libumem/include/sys/
cp ${SRC_UCM}/sys/vmem.h ${DST_LIB}/libumem/include/sys/
echo "* zfs/lib/libuutil"
mkdir -p ${DST_LIB}/libuutil/include/
@ -92,7 +92,6 @@ cp ${SRC_LIB}/libc/port/gen/strnlen.c ${DST_LIB}/libspl/
cp ${SRC_LIB}/libgen/common/mkdirp.c ${DST_LIB}/libspl/
cp ${SRC_CM}/unicode/u8_textprep.c ${DST_LIB}/libspl/
cp ${SRC_UCM}/os/list.c ${DST_LIB}/libspl/
cp ${SRC_UCM}/sys/vmem.h ${DST_LIB}/libspl/include/sys/
cp ${SRC_UCM}/sys/list.h ${DST_LIB}/libspl/include/sys/
cp ${SRC_UCM}/sys/list_impl.h ${DST_LIB}/libspl/include/sys/

0
zfs/lib/libspl/include/sys/vmem.h → zfs/lib/libumem/include/sys/vmem.h
View File

0
zfs/lib/libumem/sys/vmem_impl_user.h → zfs/lib/libumem/include/sys/vmem_impl_user.h
View File