[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.5.5-683-g8aa6974

[Aron Xu]

The following commit has been merged in the master branch:
commit 8aa697480941d2405b8c6b9a2dda6a71e42c673d
Author: Aron Xu <aron at debian.org>
Date:   Mon Apr 25 23:52:33 2016 +0800

    Fix binary module builds

diff --git a/debian/rules b/debian/rules
index bc61fee..13ca520 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,10 @@ ifndef SPL
 SPL=/usr/src/spl-$(VERSION)
 endif
 
+ifndef SPLOBJ
+SPLOBJ=/var/lib/dkms/spl/$(VERSION)/$(KVERS)/$(shell dpkg-architecture -qDEB_TARGET_GNU_CPU)
+endif
+
 non_epoch_version=$(shell echo $(KVERS) | perl -pe 's/^\d+://')
 PACKAGE=zfs
 pmodules = $(PACKAGE)-modules-$(non_epoch_version)
@@ -150,7 +154,8 @@ override_dh_configure_modules_udeb_stamp:
 		--with-config=kernel \
 		--with-linux=$(KSRC) \
 		--with-linux-obj=$(KOBJ) \
-		--with-spl=$(SPL)
+		--with-spl=$(SPL) \
+		--with-spl-obj=$(SPLOBJ)
 	touch override_dh_configure_modules_udeb_stamp
 
 override_dh_configure_modules: override_dh_configure_modules_stamp
@@ -159,7 +164,8 @@ override_dh_configure_modules_stamp:
 		--with-config=kernel \
 		--with-linux=$(KSRC) \
 		--with-linux-obj=$(KOBJ) \
-		--with-spl=$(SPL)
+		--with-spl=$(SPL) \
+		--with-spl-obj=$(SPLOBJ)
 	touch override_dh_configure_modules_stamp
 
 override_dh_binary-modules-udeb: override_dh_prep-deb-files override_dh_configure_modules_udeb

-- 
OpenZFS on Linux