X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fupdate-zfs.sh;h=1329e641a588724d8e175a0e2077ed7b69aca481;hb=c4911ece249bad4329e1ed6a9de6fba51bd06f1f;hp=318f45f396f7c5ece37dbded5d0196d50c5f11ad;hpb=4b7ee081ce0c36750d8039ec98c160a0a1ec471b;p=zfs.git

diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh
index 318f45f..1329e64 100755
--- a/scripts/update-zfs.sh
+++ b/scripts/update-zfs.sh
@@ -63,13 +63,9 @@ 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/
 
@@ -100,6 +96,12 @@ 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/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/