Script updates

[zfs.git] / scripts / update-zfs.sh

diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh
index 318f45f..d3ff519 100755 (executable)
--- a/scripts/update-zfs.sh
+++ b/scripts/update-zfs.sh
@@ -57,23 +57,19 @@ 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/
 cp ${SRC_UCM}/sys/avl_impl.h                   ${DST_MOD}/avl/include/sys/
 
-echo "* module/nvpair + lib/libnvpair"
+echo "* module/nvpair"
 mkdir -p ${DST_MOD}/nvpair/include/sys/
 cp ${SRC_CM}/nvpair/nvpair.c                   ${DST_MOD}/nvpair/
-cp ${SRC_LIB}/libnvpair/libnvpair.c            ${DST_MOD}/nvpair/
-cp ${SRC_UCM}/os/nvpair_alloc_system.c         ${DST_MOD}/nvpair/
-cp ${SRC_CM}/nvpair/nvpair_alloc_fixed.c       ${DST_MOD}/nvpair/
-cp ${SRC_LIB}/libnvpair/libnvpair.h            ${DST_MOD}/nvpair/include/
 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/
@@ -100,11 +96,23 @@ 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/
+cp ${SRC_LIB}/libnvpair/libnvpair.c            ${DST_LIB}/libnvpair/
+cp ${SRC_LIB}/libnvpair/libnvpair.h            ${DST_LIB}/libnvpair/include/
+
 echo "* lib/libuutil"
 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/