Drop merged patches, update remainders

[mirror_zfs-debian.git] / debian / patches / 0001-Prevent-manual-builds-in-the-DKMS-source.patch

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
index 56c42aa9337c987c0007987be2d1c716aac78cde..bc00ad9a2d749c0d3cc9246bcf639acc7decb60f 100644 (file)
--- a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
+++ b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
@@ -1,29 +1,16 @@
-From: Darik Horn <dajhorn@vanadac.com>
-Date: Tue, 17 Jan 2012 19:45:07 -0600
-Subject: Prevent manual builds in the DKMS source.
+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@hungry.com>
+Last-Update: 2017-10-06
 
-Print an instructive error messsage and exit if the `dkms.conf` file
-exists when the userland is configured. (ie: `--with-config=user`)
-
-A non-trivial number of people try to rebuild ZoL from the
-`/usr/src/zfs` tree, which is modified to better satisfy Debian
-packaging policy and contains only the module sources for DKMS.
-
-Regardless, local installations usually break managed installations,
-so this autotools test could be further enhanced to check whether
-ZFS has a DKMS registration.
----
- config/dkms.m4      |   14 ++++++++++++++
- config/user.m4      |    1 +
- config/zfs-build.m4 |    6 +++---
- 3 files changed, 18 insertions(+), 3 deletions(-)
- create mode 100644 config/dkms.m4
-
-diff --git a/config/dkms.m4 b/config/dkms.m4
-new file mode 100644
-index 0000000..cfa1152
+Index: zfs/config/dkms.m4
+===================================================================
 --- /dev/null
-+++ b/config/dkms.m4
++++ zfs/config/dkms.m4
 @@ -0,0 +1,14 @@
 +dnl #
 +dnl # Prevent manual building in DKMS source tree.
@@ -39,34 +26,29 @@ index 0000000..cfa1152
 +              AC_MSG_RESULT([not found])
 +        ])
 +])
-diff --git a/config/user.m4 b/config/user.m4
-index 4fcef3d..16b8a76 100644
---- a/config/user.m4
-+++ b/config/user.m4
+Index: zfs/config/user.m4
+===================================================================
+--- zfs.orig/config/user.m4
++++ zfs/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_ARCH
-       ZFS_AC_CONFIG_USER_IOCTL
-diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
-index 8e6b13b..c7df551 100644
---- a/config/zfs-build.m4
-+++ b/config/zfs-build.m4
-@@ -86,10 +86,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
+       ZFS_AC_CONFIG_USER_SYSTEMD
+Index: zfs/config/zfs-build.m4
+===================================================================
+--- zfs.orig/config/zfs-build.m4
++++ zfs/config/zfs-build.m4
+@@ -63,8 +63,8 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        ZFS_AC_CONFIG_ALWAYS
  
        case "$ZFS_CONFIG" in
 -              kernel) ZFS_AC_CONFIG_KERNEL ;;
                user)   ZFS_AC_CONFIG_USER   ;;
--              all)    ZFS_AC_CONFIG_KERNEL
--                      ZFS_AC_CONFIG_USER   ;;
 +              kernel) ZFS_AC_CONFIG_KERNEL ;;
-+              all)    ZFS_AC_CONFIG_USER
-+                      ZFS_AC_CONFIG_KERNEL ;;
+               all)    ZFS_AC_CONFIG_USER
+                       ZFS_AC_CONFIG_KERNEL ;;
                srpm)                        ;;
-               *)
-               AC_MSG_RESULT([Error!])
---