Thu May 12 10:28:48 2011 UTC ()
Add message to use the mount script so that mount -t glusterfs works
Also remove reference to /etc/mtab in it, prefer /proc/mounts


(manu)
diff -r1.4 -r1.5 pkgsrc/filesystems/glusterfs/MESSAGE.NetBSD
diff -r1.7 -r1.8 pkgsrc/filesystems/glusterfs/Makefile
cvs diff -r1.4 -r1.5 pkgsrc/filesystems/glusterfs/MESSAGE.NetBSD (expand / switch to unified diff)

--- pkgsrc/filesystems/glusterfs/MESSAGE.NetBSD 2011/04/28 10:49:41 1.4
+++ pkgsrc/filesystems/glusterfs/MESSAGE.NetBSD 2011/05/12 10:28:47 1.5
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1=========================================================================== 1===========================================================================
2$NetBSD: MESSAGE.NetBSD,v 1.4 2011/04/28 10:49:41 tnn Exp $ 2$NetBSD: MESSAGE.NetBSD,v 1.5 2011/05/12 10:28:47 manu Exp $
 3
 4In order to use mount -t glusterfs, please install this link
 5 ln -s ${PREFIX}/sbin/mount.glusterfs /sbin/mount_glusterfs
3 6
4glusterfs clients need the following in /etc/sysctl.conf in order to 7glusterfs clients need the following in /etc/sysctl.conf in order to
5avoid hangs on I/O operations: 8avoid hangs on I/O operations:
6kern.sbmax=4194304 9 kern.sbmax=4194304
7net.inet.tcp.sendbuf_max=1048576 10 net.inet.tcp.sendbuf_max=1048576
8net.inet.tcp.recvbuf_max=1048576 11 net.inet.tcp.recvbuf_max=1048576
9 12
10glusterfs servers will need extended attributes in exported filesystems. 13glusterfs servers will need extended attributes in exported filesystems.
11The required attributes can be initialized by running 14The required attributes can be initialized by running
12 ${PREFIX}/etc/glusterfs/xattr-init.sh 15 ${PREFIX}/etc/glusterfs/xattr-init.sh
13 16
14=========================================================================== 17===========================================================================
cvs diff -r1.7 -r1.8 pkgsrc/filesystems/glusterfs/Makefile (expand / switch to unified diff)

--- pkgsrc/filesystems/glusterfs/Makefile 2011/05/09 09:38:26 1.7
+++ pkgsrc/filesystems/glusterfs/Makefile 2011/05/12 10:28:47 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2011/05/09 09:38:26 manu Exp $ 1# $NetBSD: Makefile,v 1.8 2011/05/12 10:28:47 manu Exp $
2# 2#
3 3
4DISTNAME= glusterfs-3.1.4 4DISTNAME= glusterfs-3.1.4
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= filesystems 6CATEGORIES= filesystems
7MASTER_SITES= http://download.gluster.com/pub/gluster/glusterfs/3.1/LATEST/ 7MASTER_SITES= http://download.gluster.com/pub/gluster/glusterfs/3.1/LATEST/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gluster.org/ 10HOMEPAGE= http://www.gluster.org/
11COMMENT= Cluster filesystem 11COMMENT= Cluster filesystem
12LICENSE= gnu-gpl-v3 12LICENSE= gnu-gpl-v3
13 13
14PKG_DESTDIR_SUPPORT= user-destdir 14PKG_DESTDIR_SUPPORT= user-destdir
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 17USE_LIBTOOL= yes
18USE_TOOLS+= flex bison 18USE_TOOLS+= flex bison
@@ -26,26 +26,31 @@ MAKE_FLAGS+= LEXLIB="" @@ -26,26 +26,31 @@ MAKE_FLAGS+= LEXLIB=""
26MAKE_FLAGS+= libglusterfs_la_LIBADD="" 26MAKE_FLAGS+= libglusterfs_la_LIBADD=""
27MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q} 27MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q}
28 28
29SUBST_CLASSES+= py 29SUBST_CLASSES+= py
30SUBST_STAGE.py= post-build 30SUBST_STAGE.py= post-build
31SUBST_FILES.py= extras/volgen/glusterfs-volgen 31SUBST_FILES.py= extras/volgen/glusterfs-volgen
32SUBST_SED.py= -e "s,/usr/bin/python,${PYTHONBIN},g" 32SUBST_SED.py= -e "s,/usr/bin/python,${PYTHONBIN},g"
33 33
34SUBST_CLASSES+= bash 34SUBST_CLASSES+= bash
35SUBST_STAGE.bash= post-build 35SUBST_STAGE.bash= post-build
36SUBST_FILES.bash= xlators/mount/fuse/utils/mount.glusterfs 36SUBST_FILES.bash= xlators/mount/fuse/utils/mount.glusterfs
37SUBST_SED.bash= -e "s,/bin/bash,/bin/sh,g" 37SUBST_SED.bash= -e "s,/bin/bash,/bin/sh,g"
38 38
 39SUBST_CLASSES+= mtab
 40SUBST_STAGE.mtab= post-build
 41SUBST_FILES.mtab= xlators/mount/fuse/utils/mount.glusterfs
 42SUBST_SED.mtab= -e "s,/etc/mtab,/proc/mounts,g"
 43
39SUBST_CLASSES+= etc 44SUBST_CLASSES+= etc
40SUBST_STAGE.etc= pre-build 45SUBST_STAGE.etc= pre-build
41SUBST_FILES.etc+= cli/src/cli-rpc-ops.c 46SUBST_FILES.etc+= cli/src/cli-rpc-ops.c
42SUBST_FILES.etc+= libglusterfs/src/compat.h 47SUBST_FILES.etc+= libglusterfs/src/compat.h
43SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd-op-sm.c 48SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd-op-sm.c
44SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd.h 49SUBST_FILES.etc+= xlators/mgmt/glusterd/src/glusterd.h
45SUBST_FILES.etc+= doc/examples/replicate.vol 50SUBST_FILES.etc+= doc/examples/replicate.vol
46SUBST_FILES.etc+= doc/examples/protocol-server.vol 51SUBST_FILES.etc+= doc/examples/protocol-server.vol
47SUBST_FILES.etc+= doc/examples/unify.vol 52SUBST_FILES.etc+= doc/examples/unify.vol
48SUBST_FILES.etc+= doc/examples/stripe.vol 53SUBST_FILES.etc+= doc/examples/stripe.vol
49SUBST_FILES.etc+= doc/glusterd.vol 54SUBST_FILES.etc+= doc/glusterd.vol
50SUBST_FILES.etc+= doc/glusterfsd.8 55SUBST_FILES.etc+= doc/glusterfsd.8
51SUBST_FILES.etc+= doc/glusterfsd.vol.sample 56SUBST_FILES.etc+= doc/glusterfsd.vol.sample
@@ -53,24 +58,25 @@ SUBST_SED.etc= -e "s,/etc/gluster,${PRE @@ -53,24 +58,25 @@ SUBST_SED.etc= -e "s,/etc/gluster,${PRE
53 58
54REPLACE_PYTHON+= ${WRKSRC}/extras/volgen/glusterfs-volgen 59REPLACE_PYTHON+= ${WRKSRC}/extras/volgen/glusterfs-volgen
55 60
56EGDIR= ${PREFIX}/etc/glusterfs 61EGDIR= ${PREFIX}/etc/glusterfs
57CONF_FILES+= ${EGDIR}/glusterfs.vol.sample ${EGDIR}/glusterfs.vol 62CONF_FILES+= ${EGDIR}/glusterfs.vol.sample ${EGDIR}/glusterfs.vol
58CONF_FILES+= ${EGDIR}/glusterfsd.vol.sample ${EGDIR}/glusterfsd.vol 63CONF_FILES+= ${EGDIR}/glusterfsd.vol.sample ${EGDIR}/glusterfsd.vol
59CONF_FILES+= ${EGDIR}/glusterd.vol ${EGDIR}/glusterd.vol 64CONF_FILES+= ${EGDIR}/glusterd.vol ${EGDIR}/glusterd.vol
60OWN_DIRS+= ${VARBASE}/log/glusterfs 65OWN_DIRS+= ${VARBASE}/log/glusterfs
61BUILD_DEFS+= VARBASE 66BUILD_DEFS+= VARBASE
62 67
63RCD_SCRIPTS= glusterfsd glusterd 68RCD_SCRIPTS= glusterfsd glusterd
64 69
65post-install: 70post-install:
66 cp ${DESTDIR}/sbin/mount.glusterfs ${DESTDIR}/${PREFIX}/sbin/ 71 ${INSTALL_SCRIPT} ${DESTDIR}/sbin/mount.glusterfs \
 72 ${DESTDIR}/${PREFIX}/sbin/
67 ${INSTALL_SCRIPT} ${FILESDIR}/xattr-init.sh \ 73 ${INSTALL_SCRIPT} ${FILESDIR}/xattr-init.sh \
68 ${DESTDIR}/${PREFIX}/etc/glusterfs 74 ${DESTDIR}/${PREFIX}/etc/glusterfs
69 75
70.include "../../mk/bsd.prefs.mk" 76.include "../../mk/bsd.prefs.mk"
71.include "../../lang/python/application.mk" 77.include "../../lang/python/application.mk"
72.if ${OPSYS} == "NetBSD" 78.if ${OPSYS} == "NetBSD"
73.include "../../filesystems/perfuse/buildlink3.mk" 79.include "../../filesystems/perfuse/buildlink3.mk"
74.endif 80.endif
75 81
76.include "../../mk/bsd.pkg.mk" 82.include "../../mk/bsd.pkg.mk"