SOURCES: kernel-misc-fuse-Makefile.am.patch - updated for 2.6.1

[qboosh]

Author: qboosh                       Date: Sat Dec  9 18:27:51 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.6.1

---- Files affected:
SOURCES:
   kernel-misc-fuse-Makefile.am.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/kernel-misc-fuse-Makefile.am.patch
diff -u SOURCES/kernel-misc-fuse-Makefile.am.patch:1.3 SOURCES/kernel-misc-fuse-Makefile.am.patch:1.4
--- SOURCES/kernel-misc-fuse-Makefile.am.patch:1.3	Wed Nov 15 01:25:43 2006
+++ SOURCES/kernel-misc-fuse-Makefile.am.patch	Sat Dec  9 19:27:46 2006
@@ -1,5 +1,5 @@
---- fuse-2.6.0/util/Makefile.am.orig	2006-10-07 18:43:50.000000000 +0200
-+++ fuse-2.6.0/util/Makefile.am	2006-10-29 15:24:08.785365500 +0100
+--- fuse-2.6.1/util/Makefile.am.orig	2006-10-28 09:37:12.000000000 +0200
++++ fuse-2.6.1/util/Makefile.am	2006-12-09 19:18:05.731925390 +0100
 @@ -9,15 +9,6 @@
  ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT 
  ulockmgr_server_LDFLAGS = -pthread
@@ -9,20 +9,20 @@
 -	-chmod u+s $(DESTDIR)$(bindir)/fusermount
 -	@if test ! -e $(DESTDIR)/dev/fuse; then \
 -		$(mkdir_p) $(DESTDIR)/dev; \
--		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229"; \
--		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229; \
+-		echo "mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true"; \
+-		mknod $(DESTDIR)/dev/fuse -m 0666 c 10 229 || true; \
 -	fi
 -
  EXTRA_DIST = mount.fuse udev.rules init_script
  
  MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@
-@@ -20,10 +20,6 @@
+@@ -29,10 +20,6 @@
  	$(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse
  	$(mkdir_p) $(DESTDIR)$(INIT_D_PATH)
  	$(INSTALL_PROGRAM) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse
 -	@if test -x /usr/sbin/update-rc.d; then \
--		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 ."; \
--		/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 .; \
+-		echo "/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true"; \
+-		/usr/sbin/update-rc.d fuse start 34 S . start 41 0 6 . || true; \
 -	fi
  
  install-data-local:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kernel-misc-fuse-Makefile.am.patch?r1=1.3&r2=1.4&f=u