X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fupdate-zfs.sh;h=abb35bc80c882b0d105bbbec9e33b7be7ec04ecb;hb=0aa61e8427c63e835d9159d3b497591b0691dfe8;hp=b4a758520ca39f4219f322a863e8e9ac49a494be;hpb=6b2c60acca39ef3468797095d3a4162e6ce69786;p=zfs.git diff --git a/scripts/update-zfs.sh b/scripts/update-zfs.sh index b4a7585..abb35bc 100755 --- a/scripts/update-zfs.sh +++ b/scripts/update-zfs.sh @@ -69,6 +69,12 @@ 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/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/ @@ -83,6 +89,7 @@ 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/libavl" @@ -94,13 +101,19 @@ 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/libzcommon" -# Full source available in 'module/zcommon' +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/ @@ -128,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/