From: Li Wei <liwei@whamcloud.com>
Date: Tue, 24 Jul 2012 08:28:36 +0000 (+0800)
Subject: LU-1664 build: Feed spl/zfs Module.symvers to osd-zfs
X-Git-Tag: 2.2.92~24
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=4367553a968c89ca8bb285a7f8fba0a276854e26;p=fs%2Flustre-release.git

LU-1664 build: Feed spl/zfs Module.symvers to osd-zfs

This hunk, from Orion, should also be included to make sure that osd-zfs
can access spl/zfs's Module.symvars files.

Change-Id: Ic4e514c1f1f8f026353c4a8c686c0e4c389663a1
Signed-off-by: Li Wei <liwei@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/3454
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---

diff --git a/autoMakefile.am b/autoMakefile.am
index 118b82c..45c2f77 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -33,7 +33,31 @@ if LDISKFS_ENABLED
 	fi
 endif # LDISKFS_ENABLED
 
-module-symvers: module-symvers-ldiskfs
+module-symvers-zfs:
+if ZFS_ENABLED
+	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
+		cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
+		cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
+	else \
+		echo -e "\n" \
+		"*** Missing spl symbols. Ensure you have built spl:\n" \
+		"*** - @SPL_OBJ@/@SYMVERFILE@\n"; \
+		exit 1; \
+	fi
+	@if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \
+		cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+	elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \
+		cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
+	else \
+		echo -e "\n" \
+		"*** Missing zfs symbols. Ensure you have built zfs:\n" \
+		"*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \
+		exit 1; \
+	fi
+endif # ZFS_ENABLED
+
+module-symvers: module-symvers-ldiskfs module-symvers-zfs
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig