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

[Robert Millan]

Author: rmh
Date: 2011-09-20 19:17:59 +0000 (Tue, 20 Sep 2011)
New Revision: 3709

Modified:
   trunk/fuse4bsd/debian/changelog
   trunk/fuse4bsd/debian/control
   trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms
   trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff
Log:
Remove versioned build-dependency on freebsd-buildutils.

Modified: trunk/fuse4bsd/debian/changelog
===================================================================
--- trunk/fuse4bsd/debian/changelog	2011-09-20 19:15:59 UTC (rev 3708)
+++ trunk/fuse4bsd/debian/changelog	2011-09-20 19:17:59 UTC (rev 3709)
@@ -2,6 +2,7 @@
 
   * Make easier to backport:
     - Remove versioned build-dependency on libc.
+    - Remove versioned build-dependency on freebsd-buildutils.
 
  -- Robert Millan <rmh at debian.org>  Tue, 20 Sep 2011 21:14:53 +0200
 

Modified: trunk/fuse4bsd/debian/control
===================================================================
--- trunk/fuse4bsd/debian/control	2011-09-20 19:15:59 UTC (rev 3708)
+++ trunk/fuse4bsd/debian/control	2011-09-20 19:17:59 UTC (rev 3709)
@@ -26,8 +26,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends},
 # first version that supports kFreeBSD
  dkms (>= 2.2.0.1-3),
-# first version that supports external kernel modules
- freebsd-buildutils (>= 8.2-2),
+ freebsd-buildutils,
  kfreebsd-headers-8 | kfreebsd-headers,
 Description: FUSE module for kFreeBSD
  This package provides FUSE module for kernel of FreeBSD.

Modified: trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms
===================================================================
--- trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms	2011-09-20 19:15:59 UTC (rev 3708)
+++ trunk/fuse4bsd/debian/fuse4bsd-dkms.dkms	2011-09-20 19:17:59 UTC (rev 3709)
@@ -1,6 +1,8 @@
 PACKAGE_NAME="fuse4bsd"
 PACKAGE_VERSION="#MODULE_VERSION#"
-MAKE[0]="PATH=/usr/lib/freebsd:$PATH WERROR= make -C fuse_module"
+# MACHINE= override is just a workaround to support freebsd-buildutils << 8.2-1
+# (see bug #602768).  It should be removed when Squeeze is EOLed.
+MAKE[0]="PATH=/usr/lib/freebsd:$PATH WERROR= MACHINE=$(dpkg-architecture -qDEB_HOST_ARCH_CPU) make -C fuse_module"
 CLEAN="PATH=/usr/lib/freebsd:$PATH make clean"
 BUILT_MODULE_NAME[0]="fuse"
 BUILT_MODULE_LOCATION[0]="fuse_module/"

Modified: trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff
===================================================================
--- trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff	2011-09-20 19:15:59 UTC (rev 3708)
+++ trunk/fuse4bsd/debian/patches/005_squeeze_backport.diff	2011-09-20 19:17:59 UTC (rev 3709)
@@ -1,3 +1,14 @@
+--- a/fuse_module/Makefile
++++ b/fuse_module/Makefile
+@@ -52,4 +52,8 @@
+ fuse_opnames.c:
+ 	env OUTF=fuse_opnames.c ${AWK} -f ../tools/genopnames.awk fuse_kernel.h
+ 
++# To support freebsd-buildutils << 8.2-2, see bug #594183
++KVER!=		uname -r
++SYSDIR=		/usr/src/kfreebsd-headers-${KVER}/sys
++
+ .include <bsd.kmod.mk>
 --- a/sbin/mount/mntopts.h
 +++ b/sbin/mount/mntopts.h
 @@ -54,6 +54,12 @@