X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre-dkms_pre-build.sh;h=11a1cb0cda92b0dc7cf1e749e7b7cbc79eb301c3;hb=36cff0e726ae719974cd9befa5dd9d0f5f006363;hp=f1688fa057b8a98fa8b992c716ffe52c0de667e8;hpb=64a49a1d42b44dfdbc2f951177be3cbb9cd368f9;p=fs%2Flustre-release.git

diff --git a/lustre-dkms_pre-build.sh b/lustre-dkms_pre-build.sh
index f1688fa..11a1cb0 100755
--- a/lustre-dkms_pre-build.sh
+++ b/lustre-dkms_pre-build.sh
@@ -19,12 +19,10 @@ case $1 in
 	    LDISKFS="--disable-ldiskfs"
 	fi
 
-	SPL_VERSION=$(dkms status -m spl -k $3 -a $5 | awk -F', ' '{print $2; exit 0}' | grep -v ': added$')
-	if [ -z $SPL_VERSION ] ; then
-		echo "spl-dkms package must already be installed and built under DKMS control"
-		exit 1
-	fi
-	ZFS_VERSION=$(dkms status -m zfs -k $3 -a $5 | awk -F', ' '{print $2; exit 0}' | grep -v ': added$')
+	# ZFS and SPL are version locked
+	ZFS_VERSION=$(dkms status -m zfs -k $3 -a $5 2>/dev/null |
+		      sed -e 's:zfs/::g' -e 's:,.*::g' | cut -d: -f1 |
+		      sort -V | head -n1)
 	if [ -z $ZFS_VERSION ] ; then
 		echo "zfs-dkms package must already be installed and built under DKMS control"
 		exit 1
@@ -32,10 +30,10 @@ case $1 in
 
 	SERVER="--enable-server $LDISKFS \
 		--with-linux=$4 --with-linux-obj=$4 \
-		--with-spl=$6/spl-${SPL_VERSION} \
-		--with-spl-obj=$7/spl/${SPL_VERSION}/$3/$5 \
-		--with-zfs=$6/zfs-${ZFS_VERSION} \
-		--with-zfs-obj=$7/zfs/${ZFS_VERSION}/$3/$5"
+		--with-spl=$(realpath $7/spl/${ZFS_VERSION}/source) \
+		--with-spl-obj=$(realpath $7/spl/kernel-$3-$5) \
+		--with-zfs=$(realpath $7/zfs/${ZFS_VERSION}/source) \
+		--with-zfs-obj=$(realpath $7/zfs/kernel-$3-$5)"
 
 	KERNEL_STUFF="--with-linux=$4 --with-linux-obj=$4"
 	;;