From 6a8e4706bb584e883d51d542855e19c56ae1186f Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Tue, 15 Mar 2016 11:37:32 -0400 Subject: [PATCH] LU-7870 osd-zfs: Build against SPL/ZFS 0.6.5.6 Build against SPL/ZFS 0.6.5.6. Fix issue with rpm's debugedit, where it can't account for path canonicalization causes the path to shrink by only one characater. So a trailing slash will cause it choke. ZFS Changelogs since 0.6.4.3: https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.6 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.5 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.4 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.3 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.2 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5.1 https://github.com/zfsonlinux/zfs/releases/tag/zfs-0.6.5 Signed-off-by: Nathaniel Clark Change-Id: I26569a038df605b7b6a37e2806d477029d68fca0 Reviewed-on: http://review.whamcloud.com/18920 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Christopher J. Morrone Reviewed-by: Alex Zhuravlev Reviewed-by: Oleg Drokin --- contrib/lbuild/lbuild | 6 +++--- lustre/ChangeLog | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 322057e..97cb7a0 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -890,7 +890,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:-0.6.4.2} + SPLZFSVER=${SPLZFSVER:-0.6.5.6} SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . @@ -902,7 +902,7 @@ build_spl_zfs() { local rpmpkg - [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*/|tail -1)" + [ "$pkg" == "zfs" ] && spldir="$(ls -d $TOPDIR/usr/src/spl-*|tail -1)" # need to fetch the repo in order to build it. # default to github but allow override @@ -997,7 +997,7 @@ build_spl_zfs() { fi popd - CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*/|tail -1) ${CONFIGURE_FLAGS}" + CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*|tail -1) ${CONFIGURE_FLAGS}" CONFIGURE_FLAGS="--with-$pkg-obj=$(ls -d $TOPDIR/usr/src/$pkg-*/$kver*|tail -1) ${CONFIGURE_FLAGS}" done diff --git a/lustre/ChangeLog b/lustre/ChangeLog index 93bb9fe..c25c172 100644 --- a/lustre/ChangeLog +++ b/lustre/ChangeLog @@ -22,8 +22,8 @@ TBD Intel Corporation 3.12.57-60.35 (SLES12 SP1) vanilla linux 4.2.1 * Recommended e2fsprogs version: 1.42.13.wc4 or newer - * Recommended ZFS / SPL version: 0.6.4.2 - * Tested with ZFS / SPL version: 0.6.4.2 + * Recommended ZFS / SPL version: 0.6.5.6 + * Tested with ZFS / SPL version: 0.6.5.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. -- 1.8.3.1