LU-15222 build: Update ZFS version to 2.0.6

Update ZFS version to 2.0.6. The changes are listed in:
https://github.com/openzfs/zfs/releases/tag/zfs-2.0.6

Lustre-change: https://review.whamcloud.com/45567
Lustre-commit: TBD (from 447f5f1aee596bca88d31b3e83bee71458f391bc)

Change-Id: I2a7df45b79f402c3d3bce8b137edd11b5224b576
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/45582
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Nathaniel Clark <nclark@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 8feddbe..8577999 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1019,7 +1019,7 @@ build_spl_zfs() {
     # The spl/zfs spec files expect RPM_BUILD_ROOT to point to the root of the
     # destination for the rpms
     export RPM_BUILD_ROOT=$TOPDIR
-    SPLZFSVER=${SPLZFSVER:-2.0.0}
+    SPLZFSVER=${SPLZFSVER:-2.0.6}
     SPLZFSTAG=${SPLZFSTAG:-}
     # "spl zfs" prior to 0.8.0
     # "zfs" for 0.8.0 and later

diff --git a/lustre/ChangeLog b/lustre/ChangeLog
index 3f09912..17fcf67 100644 (file)
--- a/lustre/ChangeLog
+++ b/lustre/ChangeLog
@@ -47,7 +47,7 @@ TBD Whamcloud
          5.4.0-37             (Ubuntu 20.04)
          5.4.0                (vanilla kernel.org)
        * Recommended e2fsprogs version: 1.45.6.wc5 or newer
-       * Recommended ZFS version: 2.0.0
+       * Recommended ZFS version: 2.0.6
        * NFS export disabled when stack size < 8192 (32-bit Lustre clients),
          since the NFSv4 export of Lustre filesystem with 4K stack may cause a
          stack overflow. For more information, please refer to bugzilla 17630.