From a4076c7544bdbdc0ac0fe20f4ef86c2aa06862fb Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Thu, 11 Dec 2008 14:21:14 -0800 Subject: [PATCH] Script updates --- {module/nvpair => lib/libnvpair}/include/libnvpair.h | 0 scripts/update-zfs.sh | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) rename {module/nvpair => lib/libnvpair}/include/libnvpair.h (100%) diff --git a/module/nvpair/include/libnvpair.h b/lib/libnvpair/include/libnvpair.h similarity index 100% rename from module/nvpair/include/libnvpair.h rename to lib/libnvpair/include/libnvpair.h diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh index 1329e64..d3ff519 100755 --- a/scripts/update-zfs.sh +++ b/scripts/update-zfs.sh @@ -57,7 +57,7 @@ rm -Rf ${DST}/zfs echo echo "------------- Updating ZFS from OpenSolaris ${RELEASE} ---------------" -echo "* module/avl + lib/libavl" +echo "* module/avl" mkdir -p ${DST_MOD}/avl/include/sys/ cp ${SRC_CM}/avl/avl.c ${DST_MOD}/avl/ cp ${SRC_UCM}/sys/avl.h ${DST_MOD}/avl/include/sys/ @@ -69,7 +69,7 @@ cp ${SRC_CM}/nvpair/nvpair.c ${DST_MOD}/nvpair/ cp ${SRC_UCM}/sys/nvpair.h ${DST_MOD}/nvpair/include/sys/ cp ${SRC_UCM}/sys/nvpair_impl.h ${DST_MOD}/nvpair/include/sys/ -echo "* module/zcommon + lib/libzcommon" +echo "* module/zcommon" mkdir -p ${DST_MOD}/zcommon/include/sys/fs/ mkdir -p ${DST_MOD}/zcommon/include/sys/fm/fs/ cp ${SRC_CM}/zfs/*.c ${DST_MOD}/zcommon/ @@ -96,6 +96,9 @@ cp ${SRC_UCM}/os/list.c ${DST_LIB}/libspl/ cp ${SRC_UCM}/sys/list.h ${DST_LIB}/libspl/include/sys/ cp ${SRC_UCM}/sys/list_impl.h ${DST_LIB}/libspl/include/sys/ +echo "* lib/libavl" +# Full source available in 'module/avl' + echo "* lib/libnvpair" mkdir -p ${DST_LIB}/libnvpair/include/ cp ${SRC_UCM}/os/nvpair_alloc_system.c ${DST_LIB}/libnvpair/ @@ -107,6 +110,9 @@ mkdir -p ${DST_LIB}/libuutil/include/ cp ${SRC_LIB}/libuutil/common/*.c ${DST_LIB}/libuutil/ cp ${SRC_LIB}/libuutil/common/*.h ${DST_LIB}/libuutil/include/ +echo "* lib/libzcommon" +# Full source available in 'module/zcommon' + echo "* lib/libzpool" mkdir -p ${DST_LIB}/libzpool/include/sys/ cp ${SRC_LIB}/libzpool/common/kernel.c ${DST_LIB}/libzpool/ -- 1.8.3.1