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

[Petter Reinholdtsen]

The following commit has been merged in the master branch:
commit 312f9b0cea657ac66179bdae654150f06e658872
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu May 12 11:51:01 2016 +0200

    Added 0001-Prevent-manual-builds-in-the-DKMS-source.patch from Ubuntu to block manual building in the DKMS source tree.

diff --git a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
new file mode 100644
index 0000000..7685a68
--- /dev/null
+++ b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
@@ -0,0 +1,54 @@
+Description: Block manual building in the DKMS source tree.
+  To avoid messing up future DKMS builds and the zfs installation,
+  block manual building of the DKMS source tree.
+Author: unknown
+Origin: ubuntu
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-05-12
+
+Index: zfs-linux-0.6.5.6/config/dkms.m4
+===================================================================
+--- /dev/null
++++ zfs-linux-0.6.5.6/config/dkms.m4
+@@ -0,0 +1,14 @@
++dnl #
++dnl # Prevent manual building in DKMS source tree.
++dnl #
++AC_DEFUN([ZFS_AC_DKMS_INHIBIT], [
++	AC_MSG_CHECKING([for dkms.conf file])
++        AS_IF([test -e dkms.conf], [
++		AC_MSG_ERROR([
++	*** ZFS should not be manually built in the DKMS source tree.
++	*** Remove all ZFS packages before compiling the ZoL sources.
++	*** Running "make install" breaks ZFS packages.])
++        ], [
++		AC_MSG_RESULT([not found])
++        ])
++])
+Index: zfs-linux-0.6.5.6/config/user.m4
+===================================================================
+--- zfs-linux-0.6.5.6.orig/config/user.m4
++++ zfs-linux-0.6.5.6/config/user.m4
+@@ -2,6 +2,7 @@ dnl #
+ dnl # Default ZFS user configuration
+ dnl #
+ AC_DEFUN([ZFS_AC_CONFIG_USER], [
++	ZFS_AC_DKMS_INHIBIT
+ 	ZFS_AC_CONFIG_USER_MOUNT_HELPER
+ 	ZFS_AC_CONFIG_USER_UDEV
+ 	ZFS_AC_CONFIG_USER_SYSTEMD
+Index: zfs-linux-0.6.5.6/config/zfs-build.m4
+===================================================================
+--- zfs-linux-0.6.5.6.orig/config/zfs-build.m4
++++ zfs-linux-0.6.5.6/config/zfs-build.m4
+@@ -87,8 +87,8 @@ AC_DEFUN([ZFS_AC_CONFIG], [
+ 	ZFS_AC_CONFIG_ALWAYS
+ 
+ 	case "$ZFS_CONFIG" in
+-		kernel) ZFS_AC_CONFIG_KERNEL ;;
+ 		user)	ZFS_AC_CONFIG_USER   ;;
++		kernel) ZFS_AC_CONFIG_KERNEL ;;
+ 		all)    ZFS_AC_CONFIG_KERNEL
+ 			ZFS_AC_CONFIG_USER   ;;
+ 		srpm)                        ;;
diff --git a/debian/patches/series b/debian/patches/series
index 7759e22..378760c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-Prevent-manual-builds-in-the-DKMS-source.patch
 1000-ppc64el-endian-support.patch
 1001-Fix-aarch64-compilation.patch

-- 
OpenZFS on Linux