X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fupdate-zfs.sh;h=abb35bc80c882b0d105bbbec9e33b7be7ec04ecb;hb=0aa61e8427c63e835d9159d3b497591b0691dfe8;hp=158457a35e888c869fb47f69fcd5d1bd43a62542;hpb=172bb4bd5e4afef721dd4d2972d8680d983f144b;p=zfs.git

diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh
index 158457a..abb35bc 100755
--- a/scripts/update-zfs.sh
+++ b/scripts/update-zfs.sh
@@ -38,7 +38,7 @@ echo "------------- Fetching OpenSolaris ${RELEASE} archive ----------------"
 wget ${REMOTE_SRC} -P ${SRC} ||
 	die "Error 'wget ${REMOTE_SRC}'"
 
-echo "------------- Unpacking OperSolaris ${RELEASE} archive ---------------"
+echo "------------- Unpacking OpenSolaris ${RELEASE} archive ---------------"
 tar -xjf ${SRC}/on-src.tar.bz2 -C ${SRC} ||
 	die "Error 'tar -xjf ${SRC}/on-src.tar.bz2 -C ${SRC}'"
 
@@ -57,23 +57,25 @@ 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/unicode"
+mkdir -p ${DST_MOD}/unicode/include/sys/
+cp ${SRC_CM}/unicode/*.c			${DST_MOD}/unicode/
+cp ${SRC_UCM}/sys/u8_textprep.h			${DST_MOD}/unicode/include/sys/
+cp ${SRC_UCM}/sys/u8_textprep_data.h		${DST_MOD}/unicode/include/sys/
+
+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/
@@ -87,31 +89,39 @@ cp ${SRC_UTS}/intel/zfs/spa_boot.c		${DST_MOD}/zfs/
 cp ${SRC_ZLIB}/*.c				${DST_MOD}/zfs/
 cp ${SRC_ZLIB}/sys/*.h				${DST_MOD}/zfs/include/sys/
 rm ${DST_MOD}/zfs/vdev_disk.c
+rm ${DST_MOD}/zfs/zvol.c
 rm ${DST_MOD}/zfs/include/sys/vdev_disk.h
 
-echo " lib/libzpool"
-mkdir -p ${DST_LIB}/libzpool/include/sys/
-cp ${SRC_LIB}/libzpool/common/kernel.c		${DST_LIB}/libzpool/
-cp ${SRC_LIB}/libzpool/common/taskq.c		${DST_LIB}/libzpool/
-cp ${SRC_LIB}/libzpool/common/util.c		${DST_LIB}/libzpool/
-cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h	${DST_LIB}/libzpool/include/sys/
+echo "* lib/libavl"
+# Full source available in 'module/avl'
 
-echo "* lib/libspl"
-mkdir -p ${DST_LIB}/libspl/include/sys/
-cp ${SRC_LIB}/libc/port/gen/strlcat.c		${DST_LIB}/libspl/
-cp ${SRC_LIB}/libc/port/gen/strlcpy.c		${DST_LIB}/libspl/
-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/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/libunicode"
+# Full source available in 'module/unicode'
 
 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/libefi"
+mkdir -p ${DST_LIB}/libefi/include/sys/
+cp ${SRC_LIB}/libefi/common/rdwr_efi.c		${DST_LIB}/libefi/
+cp ${SRC_UCM}/sys/efi_partition.h		${DST_LIB}/libefi/include/sys/
+cp ${SRC_UCM}/sys/uuid.h			${DST_LIB}/libefi/include/sys/
+
+echo "* lib/libzpool"
+mkdir -p ${DST_LIB}/libzpool/include/sys/
+cp ${SRC_LIB}/libzpool/common/kernel.c		${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/taskq.c		${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/util.c		${DST_LIB}/libzpool/
+cp ${SRC_LIB}/libzpool/common/sys/zfs_context.h	${DST_LIB}/libzpool/include/sys/
+
 echo "* lib/libzfs"
 mkdir -p ${DST_LIB}/libzfs/include/
 cp ${SRC_LIB}/libzfs/common/*.c			${DST_LIB}/libzfs/
@@ -131,10 +141,6 @@ echo "* cmd/zdb"
 mkdir -p ${DST_CMD}/zdb/
 cp ${SRC_CMD}/zdb/*.c				${DST_CMD}/zdb/
 
-echo "* cmd/zdump"
-mkdir -p ${DST_CMD}/zdump
-cp ${SRC_CMD}/zdump/*.c				${DST_CMD}/zdump/
-
 echo "* cmd/zinject"
 mkdir -p ${DST_CMD}/zinject
 cp ${SRC_CMD}/zinject/*.c			${DST_CMD}/zinject/
@@ -144,4 +150,6 @@ echo "* cmd/ztest"
 mkdir -p ${DST_CMD}/ztest
 cp ${SRC_CMD}/ztest/*.c				${DST_CMD}/ztest/
 
+echo "${REMOTE_SRC}" >${DST}/ZFS.RELEASE
+
 rm -Rf ${SRC}