From 3372e7bf6c9672a5b62f0a2531e3c5463f877fdb Mon Sep 17 00:00:00 2001 From: Nathaniel Clark Date: Thu, 23 Jan 2014 15:02:51 -0500 Subject: [PATCH] LU-5203 zfs: Update spl/zfs version to 0.6.3 Update SPL and ZFS version to official 0.6.3. This also fixes the "search path" for libzfs.so. Lustre-commit: 1f5fa56a0b824e684c32d382d0108c92d9125c5a Lustre-change: http://review.whamcloud.com/8979 Signed-off-by: Nathaniel Clark Reviewed-by: Andreas Dilger Reviewed-by: Oleg Drokin Change-Id: I710d254d93ce9c3db64ab4bf250f8bf556c684aa Reviewed-on: http://review.whamcloud.com/11298 Tested-by: Jenkins Tested-by: Maloo --- config/lustre-build-zfs.m4 | 2 +- contrib/lbuild/lbuild | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/lustre-build-zfs.m4 b/config/lustre-build-zfs.m4 index 40ca661..61a008a 100644 --- a/config/lustre-build-zfs.m4 +++ b/config/lustre-build-zfs.m4 @@ -283,7 +283,7 @@ AC_DEFUN([LB_ZFS_DEVEL], [ AS_IF([test ! -z "${zfsdevel}"], [ AS_IF([test -d "${zfsdevel}/usr/include/libspl" && test -d "${zfsdevel}/usr/include/libzfs"], [ zfsinc="-I $zfsdevel/usr/include/libspl -I $zfsdevel/usr/include/libzfs" - zfslib="-L$zfsdevel/lib64 -L$zfsdevel/lib" + zfslib="-L$zfsdevel/usr/lib64 -L$zfsdevel/usr/lib -L$zfsdevel/lib64 -L$zfsdevel/lib" ], [ AC_MSG_ERROR([Path to development headers directory does not exist]) ]) diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild index 219934f..d30c0d5 100755 --- a/contrib/lbuild/lbuild +++ b/contrib/lbuild/lbuild @@ -1057,8 +1057,8 @@ 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.2} - SPLZFSTAG=${SPLZFSTAG:-upstream-master} + SPLZFSVER=${SPLZFSVER:-0.6.3} + SPLZFSTAG=${SPLZFSTAG:-} # The files expect a kver to be set to the kernel version . local kver=$(find_linux_release) @@ -1156,7 +1156,7 @@ build_spl_zfs() { # https://github.com/zfsonlinux/zfs/issues/2329 # and it looks like it could be one day soon: # https://github.com/zfsonlinux/zfs/pull/2341 - local devel_rpms=$(ls -1 $TOPDIR/RPMS/*/{$pkg-devel,$pkg-$SPLZFSVER}-*.rpm) + local devel_rpms=$(ls -1 $TOPDIR/RPMS/*/{$pkg-devel,$pkg-$SPLZFSVER,lib*}-*.rpm) for rpm in $devel_rpms; do rpm2cpio $rpm | cpio -id done -- 1.8.3.1