LU-3497 build: Use alt. path for ZFS development headers

[fs/lustre-release.git] / contrib / lbuild / lbuild

diff --git a/contrib/lbuild/lbuild b/contrib/lbuild/lbuild
index 13e04ba..ed6b771 100755 (executable)
--- a/contrib/lbuild/lbuild
+++ b/contrib/lbuild/lbuild
@@ -1101,6 +1101,16 @@ build_spl_zfs() {
        for rpm in $rpms; do
             rpm2cpio $rpm | cpio -id
        done
+
+       if [ "$pkg" == "zfs" ]; then
+           mkdir -p $TOPDIR/zfsdevel
+           pushd $TOPDIR/zfsdevel
+           # We also need to extract zfs-devel rpm
+           local devel_rpm=$(ls -1 $TOPDIR/RPMS/*/$pkg-devel-*.rpm)
+           rpm2cpio $devel_rpm | cpio -id
+           popd
+           CONFIGURE_FLAGS="--with-$pkg-devel=$TOPDIR/zfsdevel ${CONFIGURE_FLAGS}"
+       fi
         popd
 
         CONFIGURE_FLAGS="--with-$pkg=$(ls -d $TOPDIR/usr/src/$pkg-*/|tail -1) ${CONFIGURE_FLAGS}"