From cb73cb5083ee2db5c6ed607c44e1002788b4eee6 Mon Sep 17 00:00:00 2001 From: Bruno Faccini Date: Tue, 5 Jan 2016 21:55:57 +0100 Subject: [PATCH 1/1] LU-7601 build: fix typo for spl/zfs added case handler A typo has been introduced to detect SPL/ZFS DKMS versions even when they are still in the "added" state. Signed-off-by: Bruno Faccini Change-Id: I51c269c6c35991cf1b7c26fa44769c1bc73fe20d Reviewed-on: http://review.whamcloud.com/17829 Tested-by: Jenkins Reviewed-by: Nathaniel Clark Tested-by: Maloo Reviewed-by: John L. Hammond Reviewed-by: Oleg Drokin --- lustre-dkms.spec.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lustre-dkms.spec.in b/lustre-dkms.spec.in index 788b74a..967d89c 100644 --- a/lustre-dkms.spec.in +++ b/lustre-dkms.spec.in @@ -75,8 +75,8 @@ cat << EOF > lustre-dkms_post-add.sh if [ \$1 = "lustre-client" ] ; then SERVER="--disable-server" else - SPL_VERSION=\$(dkms status -m spl -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\\\$//') - ZFS_VERSION=\$(dkms status -m zfs -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\\\$//') + SPL_VERSION=\$(dkms status -m spl -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\$//') + ZFS_VERSION=\$(dkms status -m zfs -k \$3/\$5 | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\$//') SERVER="--enable-server --disable-ldiskfs --with-linux=\$4 --with-linux-obj=\$4 \\ --with-spl=\$6/spl-\${SPL_VERSION} \\ -- 1.8.3.1