[Glibc-bsd-commits] r4741 - in trunk/fuse4bsd/debian: . patches

[Robert Millan]

Author: rmh
Date: 2013-07-13 14:17:09 +0000 (Sat, 13 Jul 2013)
New Revision: 4741

Added:
   trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff
Modified:
   trunk/fuse4bsd/debian/changelog
   trunk/fuse4bsd/debian/patches/series
Log:
prevent_kfreebsd10_build.diff: kFreeBSD 10.x already provides native FUSE support.

Modified: trunk/fuse4bsd/debian/changelog
===================================================================
--- trunk/fuse4bsd/debian/changelog	2013-07-13 14:12:24 UTC (rev 4740)
+++ trunk/fuse4bsd/debian/changelog	2013-07-13 14:17:09 UTC (rev 4741)
@@ -5,6 +5,8 @@
     - Remove versioned build-dependency on freebsd-buildutils.
   * Move init script to fuse4bsd-dkms.
   * Remove squeeze compatibility kludge.
+  * prevent_kfreebsd10_build.diff: kFreeBSD 10.x already provides native
+    FUSE support.
 
  -- Robert Millan <rmh at debian.org>  Sat, 13 Jul 2013 16:12:13 +0200
 

Added: trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff	                        (rev 0)
+++ trunk/fuse4bsd/debian/patches/prevent_kfreebsd10_build.diff	2013-07-13 14:17:09 UTC (rev 4741)
@@ -0,0 +1,13 @@
+--- a/fuse_module/fuse_main.c
++++ b/fuse_module/fuse_main.c
+@@ -20,6 +20,10 @@
+ #include <sys/buf.h>
+ #include <sys/sysctl.h>
+ 
++#if __FreeBSD_version >= 1000019
++#error "kFreeBSD 10.x already provides native FUSE support"
++#endif
++
+ #include "fuse.h"
+ 
+ static void			 fuse_bringdown(eventhandler_tag eh_tag);

Modified: trunk/fuse4bsd/debian/patches/series
===================================================================
--- trunk/fuse4bsd/debian/patches/series	2013-07-13 14:12:24 UTC (rev 4740)
+++ trunk/fuse4bsd/debian/patches/series	2013-07-13 14:17:09 UTC (rev 4741)
@@ -4,3 +4,4 @@
 003_kernel_api.diff
 004_freebsd_macro.diff
 005_squeeze_backport.diff
+prevent_kfreebsd10_build.diff