X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fupdate-zfs.sh;h=ce772fd244e4b77880d4863afcbd0c7c63730ebb;hb=77755a5771c339a1d96c36ab1a8f1e41e14507f0;hp=158457a35e888c869fb47f69fcd5d1bd43a62542;hpb=172bb4bd5e4afef721dd4d2972d8680d983f144b;p=zfs.git diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh index 158457a..ce772fd 100755 --- a/scripts/update-zfs.sh +++ b/scripts/update-zfs.sh @@ -89,13 +89,6 @@ cp ${SRC_ZLIB}/sys/*.h ${DST_MOD}/zfs/include/sys/ rm ${DST_MOD}/zfs/vdev_disk.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/libspl" mkdir -p ${DST_LIB}/libspl/include/sys/ cp ${SRC_LIB}/libc/port/gen/strlcat.c ${DST_LIB}/libspl/ @@ -112,6 +105,13 @@ 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/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/ @@ -144,4 +144,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}