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 5800a7a78197acee46a143ff2bbc6d51f5b3ad98..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,4 +1,4 @@
-From e226a12f50759eb7269a3957581ed61fcf9e9cc4 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/8] Prevent manual builds in the DKMS source.
@@ -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 c5983d3..be1edfa 100644
+index 6bfea51..fda0a4f 100644
 --- a/config/zfs-build.m4
 +++ b/config/zfs-build.m4
-@@ -58,10 +58,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 c5983d3..be1edfa 100644
                *)
                AC_MSG_RESULT([Error!])
 -- 
-1.7.5.4
+1.7.9.5