Merge branch 'upstream'

[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 bfc14b2a63ba42badcf45a4d6af051e17ecf81e5..1b64d910a3eba4fc919a42118d7fb0a27d250e1e 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,7 +1,7 @@
-From 4cdadd9bb09dbbaea7236d1becf3016c4fae0294 Mon Sep 17 00:00:00 2001
+From d369ae1767fe8b0d5058511775b3d43950fe1214 Mon Sep 17 00:00:00 2001
 From: Darik Horn <dajhorn@vanadac.com>
 Date: Tue, 17 Jan 2012 19:45:07 -0600
-Subject: [PATCH 1/6] Prevent manual builds in the DKMS source.
+Subject: [PATCH 1/8] Prevent manual builds in the DKMS source.
 
 Print an instructive error messsage and exit if the `dkms.conf` file
 exists when the userland is configured. (ie: `--with-config=user`)
@@ -53,10 +53,10 @@ index 4fcef3d..16b8a76 100644
        ZFS_AC_CONFIG_USER_ARCH
        ZFS_AC_CONFIG_USER_IOCTL
 diff --git a/config/zfs-build.m4 b/config/zfs-build.m4
-index aa8d3e5..784e21e 100644
+index 6bfea51..fda0a4f 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
-@@ -54,10 +54,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
+@@ -81,10 +81,10 @@ AC_DEFUN([ZFS_AC_CONFIG], [
        ZFS_AC_CONFIG_ALWAYS
  
        case "$ZFS_CONFIG" in
@@ -71,5 +71,5 @@ index aa8d3e5..784e21e 100644
                *)
                AC_MSG_RESULT([Error!])
 -- 
-1.7.5.4
+1.7.9.5