From acd7ebf257453f46be42c8592e2fd784c676a114 Mon Sep 17 00:00:00 2001 From: Justin Clift Date: Mon, 15 Sep 2014 09:48:05 +0100 Subject: osx: Remove legacy extras/MacOSX directory Backport of http://review.gluster.org/8736 BUG: 1141683 Change-Id: Ic37df769db856196727d2799396c1dbaf4bcdd1a Signed-off-by: Justin Clift Reviewed-on: http://review.gluster.org/8737 Reviewed-by: Humble Devassy Chirammal Tested-by: Gluster Build System Reviewed-by: Niels de Vos Reviewed-by: Vijay Bellur --- extras/MacOSX/Portfile | 26 -------------- extras/MacOSX/README.MacOSX | 84 --------------------------------------------- extras/Makefile.am | 12 +++---- 3 files changed, 6 insertions(+), 116 deletions(-) delete mode 100644 extras/MacOSX/Portfile delete mode 100644 extras/MacOSX/README.MacOSX diff --git a/extras/MacOSX/Portfile b/extras/MacOSX/Portfile deleted file mode 100644 index 1262a44daea..00000000000 --- a/extras/MacOSX/Portfile +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -PortSystem 1.0 - -name glusterfs -version 2.0.0rc8 -categories fuse -maintainers amar@gluster.com -description GlusterFS -long_description GlusterFS is a cluster file system, flexible to tune it for your needs. -homepage http://www.gluster.org/ -platforms darwin -master_sites http://ftp.gluster.com/pub/gluster/glusterfs/2.0/2.0.0 - -configure.args --disable-bdb -checksums md5 33c2d02344d4fab422e80cfb637e0b48 - -post-destroot { - file mkdir ${destroot}/Library/LaunchDaemons/ - file copy ${worksrcpath}/extras/glusterfs-server.plist \ - ${destroot}/Library/LaunchDaemons/com.gluster.glusterfs.plist - - file mkdir ${destroot}/sbin/ - file copy ${worksrcpath}/xlators/mount/fuse/utils/mount_glusterfs \ - ${destroot}/sbin/ -} \ No newline at end of file diff --git a/extras/MacOSX/README.MacOSX b/extras/MacOSX/README.MacOSX deleted file mode 100644 index ec7abc2cc78..00000000000 --- a/extras/MacOSX/README.MacOSX +++ /dev/null @@ -1,84 +0,0 @@ - -Mostly the usage is over OS-X. - -Important links - -GlusterFS -========= -* http://www.gluster.org -* http://gluster.org/docs/index.php/GlusterFS -* http://gluster.org/docs/index.php/GlusterFS_on_MAC_OS_X - -MacFUSE -======= -* http://code.google.com/p/macfuse/ -* http://code.google.com/p/macfuse/wiki/FAQ - - -Important steps: -================ - -Make sure that there is no previous installation of MacFUSE exists in the -system. Run, - - bash# sudo /Library/Filesystems/fusefs.fs/Support/uninstall-macfuse-core.sh - -After this, install MacFUSE (mostly through .dmg available in macfuse homepage -or if Gluster Inc provides any custom built .dmg) - -Make sure the .dmg of glusterfs is built against the installed MacFUSE version -(if not, any operations over mountpoint gives EIO ie, Input/Output Error). If -glusterfs tarball is used then compile it only after the MacFUSE installation -is complete. - -To make an entry in /etc/fstab for glusterfs mount, use 'vifs' command - - bash# sudo vifs - -after the entry is added in /etc/fstab, it can be mounted by 'mount' command. - -To start the server process one can use the 'launchd' mechanism. Follow below -steps after installation - - bash# launchctl load /Library/LaunchDaemons/com.gluster.glusterfs.plist - -No need to run the command if the machine reboots, as it will be loaded -automatically by launchd process. - -Now copy the server volume file in the proper path - - bash# sudo vi /opt/local/etc/glusterfs/server.vol - -NOTE: (If glusterfs is installed in different path other than '/opt/local' - update the volume file at the corresponding path, and also need to - update the /Library/LaunchDaemons/com.gluster.glusterfs.plist with - the proper path) - -Once the volume file is updated, administrator can start the server process by -running, - - bash# launchctl start com.gluster.glusterfs - -and stop like - - bash# launchctl stop com.gluster.glusterfs - -NOTE: To start the process by default when the loaded, one need to add the -following lines to .plist file - ----- - KeepAlive - - ----- - - - - -Install using .dmg in Terminal -================================= - - bash# hdiutil attach .dmg - bash# cd /Volumes// - bash# installer -pkg .pkg -installer / - bash# cd - bash# hdiutil detach /Volumes// - diff --git a/extras/Makefile.am b/extras/Makefile.am index 74b6d17c16b..b6cdb90434f 100644 --- a/extras/Makefile.am +++ b/extras/Makefile.am @@ -13,12 +13,12 @@ vol_DATA = glusterd.vol scriptsdir = $(datadir)/glusterfs/scripts scripts_DATA = post-upgrade-script-for-quota.sh pre-upgrade-script-for-quota.sh -EXTRA_DIST = $(conf_DATA) specgen.scm MacOSX/Portfile glusterfs-mode.el \ - glusterfs.vim migrate-unify-to-distribute.sh backend-xattr-sanitize.sh \ - backend-cleanup.sh disk_usage_sync.sh clear_xattrs.sh \ - glusterd-sysconfig glusterd.vol post-upgrade-script-for-quota.sh \ - pre-upgrade-script-for-quota.sh command-completion/gluster.bash \ - command-completion/Makefile command-completion/README +EXTRA_DIST = $(conf_DATA) specgen.scm glusterfs-mode.el glusterfs.vim \ + migrate-unify-to-distribute.sh backend-xattr-sanitize.sh backend-cleanup.sh \ + disk_usage_sync.sh clear_xattrs.sh glusterd-sysconfig glusterd.vol \ + post-upgrade-script-for-quota.sh pre-upgrade-script-for-quota.sh \ + command-completion/gluster.bash command-completion/Makefile \ + command-completion/README install-data-local: $(mkdir_p) $(DESTDIR)$(GLUSTERD_WORKDIR)/groups -- cgit