Whamcloud - gitweb
LU-7601 build: fix typo for spl/zfs added case handler 29/17829/2
authorBruno Faccini <bruno.faccini@intel.com>
Tue, 5 Jan 2016 20:55:57 +0000 (21:55 +0100)
committerOleg Drokin <oleg.drokin@intel.com>
Mon, 11 Jan 2016 19:07:31 +0000 (19:07 +0000)
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 <bruno.faccini@intel.com>
Change-Id: I51c269c6c35991cf1b7c26fa44769c1bc73fe20d
Reviewed-on: http://review.whamcloud.com/17829
Tested-by: Jenkins
Reviewed-by: Nathaniel Clark <nathaniel.l.clark@intel.com>
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: John L. Hammond <john.hammond@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
lustre-dkms.spec.in

index 788b74a..967d89c 100644 (file)
@@ -75,8 +75,8 @@ cat << EOF > lustre-dkms_post-add.sh
 if [ \$1 = "lustre-client" ] ; then
        SERVER="--disable-server"
 else
 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} \\
 
        SERVER="--enable-server --disable-ldiskfs --with-linux=\$4 --with-linux-obj=\$4 \\
               --with-spl=\$6/spl-\${SPL_VERSION} \\