From: Bruno Faccini <bruno.faccini@intel.com>
Date: Fri, 8 Aug 2014 23:18:44 +0000 (+0200)
Subject: LU-5465 scripts: handle added [spl,zfs]-dkms case
X-Git-Tag: 2.6.51~7
X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=9593c98a0c59403857f84f1e899f49cb49956ce6

LU-5465 scripts: handle added [spl,zfs]-dkms case

Get SPL/ZFS version also when [spl,zfs]-dkms RPMs have only
been added in DKMS framework and terminology.

Signed-off-by: Bruno Faccini <bruno.faccini@intel.com>
Change-Id: I70f339331d6b759fc3c120d8a07cb2f98ccaa148
Reviewed-on: http://review.whamcloud.com/11381
Tested-by: Jenkins
Tested-by: Maloo <hpdd-maloo@intel.com>
Reviewed-by: Minh Diep <minh.diep@intel.com>
Reviewed-by: Bob Glossman <bob.glossman@intel.com>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/scripts/dkms.mkconf b/lustre/scripts/dkms.mkconf
index 6b419a1..03857c5 100755
--- a/lustre/scripts/dkms.mkconf
+++ b/lustre/scripts/dkms.mkconf
@@ -22,8 +22,8 @@ cat >${filename} <<EOF
 PACKAGE_NAME="${pkgname}"
 PACKAGE_VERSION="${pkgver}"
 PACKAGE_CONFIG="${pkgcfg}"
-SPL_VERSION=\$(dkms status -m spl | awk -F', ' '{print \$2; exit 0}')
-ZFS_VERSION=\$(dkms status -m zfs | awk -F', ' '{print \$2; exit 0}')
+SPL_VERSION=\$(dkms status -m spl | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\$//')
+ZFS_VERSION=\$(dkms status -m zfs | awk -F', ' '{print \$2; exit 0}' | sed 's/: added\$//')
 PRE_BUILD="configure
   --prefix=/usr
   --with-linux=\${kernel_source_dir}