LU-5396 lod: (and mdt, mgs) make some symbols static

[fs/lustre-release.git] / lustre / scripts / dkms.mkconf

diff --git a/lustre/scripts/dkms.mkconf b/lustre/scripts/dkms.mkconf
index 4795d16..199d1c5 100755 (executable)
--- a/lustre/scripts/dkms.mkconf
+++ b/lustre/scripts/dkms.mkconf
@@ -22,18 +22,17 @@ 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}
   --with-linux-obj=\${kernel_source_dir}
-  --with-spl=\${dkms_tree}/spl/\${SPL_VERSION}/build
+  --with-spl=\${source_tree}/spl-\${SPL_VERSION}
   --with-spl-obj=\${dkms_tree}/spl/\${SPL_VERSION}/\${kernelver}/\${arch}
-  --with-zfs=\${dkms_tree}/zfs/\${ZFS_VERSION}/build
+  --with-zfs=\${source_tree}/zfs-\${ZFS_VERSION}
   --with-zfs-obj=\${dkms_tree}/zfs/\${ZFS_VERSION}/\${kernelver}/\${arch}
   --without-ldiskfs
-  --without-sysio
   --without-lustre-iokit
   --disable-snmp
   --disable-doc
@@ -118,8 +117,8 @@ DEST_MODULE_LOCATION[4]="/extra/lustre/"
 BUILT_MODULE_NAME[5]="ptlrpc"
 BUILT_MODULE_LOCATION[5]="lustre/ptlrpc/"
 DEST_MODULE_LOCATION[5]="/extra/lustre/"
-BUILT_MODULE_NAME[6]="lvfs"
-BUILT_MODULE_LOCATION[6]="lustre/lvfs/"
+BUILT_MODULE_NAME[6]="nodemap"
+BUILT_MODULE_LOCATION[6]="lustre/nodemap/"
 DEST_MODULE_LOCATION[6]="/extra/lustre/"
 BUILT_MODULE_NAME[7]="lov"
 BUILT_MODULE_LOCATION[7]="lustre/lov/"