Update core ZFS code from build 121 to build 141.

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

diff --git a/scripts/zfs-update.sh b/scripts/zfs-update.sh
index 03023ea..474c49a 100755 (executable)
--- a/scripts/zfs-update.sh
+++ b/scripts/zfs-update.sh
@@ -11,7 +11,7 @@ RELEASE=$1
 PROG=update-zfs.sh
 REMOTE_DOC_FILE=man-sunosman-20090930.tar.bz2
 REMOTE_DOC=http://dlc.sun.com/osol/man/downloads/current/${REMOTE_DOC_FILE}
-REMOTE_SRC=http://dlc.sun.com/osol/on/downloads/${RELEASE}/on-src.tar.bz2
+REMOTE_SRC=ssh://anon@hg.opensolaris.org/hg/onnv/onnv-gate
 
 die() {
        rm -Rf ${SRC}
@@ -29,10 +29,10 @@ if [ `basename $DST` != "scripts" ]; then
 fi
 
 if [ ! "$RELEASE" ]; then
-       die "Must specify ZFS release build"
+       die "Must specify ZFS release build, i.e. 'onnv_141'"
 fi
 
-SRC=`mktemp -d /tmp/os-${RELEASE}.XXXXXXXXXX`
+SRC=`mktemp -d /tmp/onnv-gate.XXXXXXXXXX`
 DST=`dirname $DST`
 
 echo "----------------------------------------------------------------"
@@ -41,28 +41,27 @@ echo "Remote Docs:   ${REMOTE_DOC}"
 echo "Local Source:  ${SRC}"
 echo "Local Dest:    ${DST}"
 echo
-echo "------------- Fetching OpenSolaris ${RELEASE} archive ----------------"
-wget -q ${REMOTE_SRC} -P ${SRC} ||
-       die "Error 'wget ${REMOTE_SRC}'"
-
+echo "------------- Fetching OpenSolaris mercurial repo ----------------"
+pushd ${SRC}
+hg clone ${REMOTE_SRC} || die "Error cloning OpenSolaris mercurial repo"
+pushd onnv-gate
+hg update -C ${RELEASE} || die "Error unknown release ${RELEASE}"
+popd
+popd
 echo "------------- Fetching OpenSolaris documentation ---------------"
 wget -q ${REMOTE_DOC} -P ${SRC} ||
        die "Error 'wget ${REMOTE_DOC}'"
 
-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}'"
-
 echo "------------- Unpacking OpenSolaris documentation --------------"
 tar -xjf ${SRC}/${REMOTE_DOC_FILE} -C ${SRC} ||
        die "Error 'tar -xjf ${SRC}/${REMOTE_DOC_FILE} -C ${SRC}'"
 
-SRC_LIB=${SRC}/usr/src/lib
-SRC_CMD=${SRC}/usr/src/cmd
-SRC_CM=${SRC}/usr/src/common
-SRC_UTS=${SRC}/usr/src/uts
-SRC_UCM=${SRC}/usr/src/uts/common
-SRC_ZLIB=${SRC}/usr/src/uts/common/fs/zfs
+SRC_LIB=${SRC}/onnv-gate/usr/src/lib
+SRC_CMD=${SRC}/onnv-gate/usr/src/cmd
+SRC_CM=${SRC}/onnv-gate/usr/src/common
+SRC_UTS=${SRC}/onnv-gate/usr/src/uts
+SRC_UCM=${SRC}/onnv-gate/usr/src/uts/common
+SRC_ZLIB=${SRC}/onnv-gate/usr/src/uts/common/fs/zfs
 SRC_MAN=${SRC}/man
 
 DST_MOD=${DST}/module
@@ -83,6 +82,7 @@ cp ${SRC_UCM}/sys/avl_impl.h                  ${DST_MOD}/avl/include/sys/
 echo "* module/nvpair"
 mkdir -p ${DST_MOD}/nvpair/include/sys/
 cp ${SRC_CM}/nvpair/nvpair.c                   ${DST_MOD}/nvpair/
+cp ${SRC_CM}/nvpair/nvpair_alloc_fixed.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/
 
@@ -94,17 +94,19 @@ 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/
 cp ${SRC_CM}/zfs/*.h                           ${DST_MOD}/zcommon/include/
 cp ${SRC_UCM}/sys/fs/zfs.h                     ${DST_MOD}/zcommon/include/sys/fs/
-cp ${SRC_UCM}/sys/fm/fs/zfs.h                  ${DST_MOD}/zcommon/include/sys/fm/fs/
 
 echo "* module/zfs"
-mkdir -p ${DST_MOD}/zpool/include/sys/
+mkdir -p ${DST_MOD}/zfs/include/sys/fm/fs/
 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/
+cp ${SRC_UCM}/os/fm.c                          ${DST_MOD}/zfs/
+cp ${SRC_UCM}/sys/fm/protocol.h                        ${DST_MOD}/zfs/include/sys/fm/
+cp ${SRC_UCM}/sys/fm/util.h                    ${DST_MOD}/zfs/include/sys/fm/
+cp ${SRC_UCM}/sys/fm/fs/zfs.h                  ${DST_MOD}/zfs/include/sys/fm/fs/
 rm ${DST_MOD}/zfs/vdev_disk.c
 rm ${DST_MOD}/zfs/zvol.c
 rm ${DST_MOD}/zfs/include/sys/vdev_disk.h
@@ -174,6 +176,6 @@ cp ${SRC_MAN}/man1m/zpool.1m                        ${DST_MAN}/man8/zpool.8
 cp ${SRC_MAN}/man1m/zdb.1m                     ${DST_MAN}/man8/zdb.8
 chmod -R 644 ${DST_MAN}/man8/*
 
-echo "${REMOTE_SRC}" >${DST}/ZFS.RELEASE
+echo "${REMOTE_SRC}/${RELEASE}" >${DST}/ZFS.RELEASE
 
 rm -Rf ${SRC}