From 94bbc1ca7cb0503bb4d1797d03f32d55bb978cdf Mon Sep 17 00:00:00 2001 From: Steven Allen Date: Sat, 20 Jul 2019 17:17:56 -0700 Subject: [PATCH] fix openbsd build by disabling fuse on openbsd fixes #5334 --- fuse/ipns/ipns_test.go | 2 +- fuse/ipns/ipns_unix.go | 2 +- fuse/ipns/link_unix.go | 2 +- fuse/mount/fuse.go | 3 +-- fuse/node/mount_openbsd.go | 13 +++++++++++++ fuse/node/mount_test.go | 2 +- fuse/node/mount_unix.go | 2 +- fuse/readonly/ipfs_test.go | 2 +- fuse/readonly/mount_unix.go | 2 +- fuse/readonly/readonly_unix.go | 2 +- mk/util.mk | 4 ++++ 11 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 fuse/node/mount_openbsd.go diff --git a/fuse/ipns/ipns_test.go b/fuse/ipns/ipns_test.go index cf59f65a7..457cbb21b 100644 --- a/fuse/ipns/ipns_test.go +++ b/fuse/ipns/ipns_test.go @@ -1,4 +1,4 @@ -// +build !nofuse +// +build !nofuse,!openbsd package ipns diff --git a/fuse/ipns/ipns_unix.go b/fuse/ipns/ipns_unix.go index f625f25a0..8568f8c96 100644 --- a/fuse/ipns/ipns_unix.go +++ b/fuse/ipns/ipns_unix.go @@ -1,4 +1,4 @@ -// +build !nofuse +// +build !nofuse,!openbsd // package fuse/ipns implements a fuse filesystem that interfaces // with ipns, the naming system for ipfs. diff --git a/fuse/ipns/link_unix.go b/fuse/ipns/link_unix.go index fade3692a..5f8df2732 100644 --- a/fuse/ipns/link_unix.go +++ b/fuse/ipns/link_unix.go @@ -1,4 +1,4 @@ -// +build !nofuse +// +build !nofuse,!openbsd package ipns diff --git a/fuse/mount/fuse.go b/fuse/mount/fuse.go index 41d14cc36..67a24f08f 100644 --- a/fuse/mount/fuse.go +++ b/fuse/mount/fuse.go @@ -1,5 +1,4 @@ -// +build !nofuse -// +build !windows +// +build !nofuse,!windows,!openbsd package mount diff --git a/fuse/node/mount_openbsd.go b/fuse/node/mount_openbsd.go new file mode 100644 index 000000000..7edbd910f --- /dev/null +++ b/fuse/node/mount_openbsd.go @@ -0,0 +1,13 @@ +// +build !nofuse + +package node + +import ( + "errors" + + core "github.com/ipfs/go-ipfs/core" +) + +func Mount(node *core.IpfsNode, fsdir, nsdir string) error { + return errors.New("FUSE not supported on OpenBSD. See #5334 (https://git.io/fjMuC).") +} diff --git a/fuse/node/mount_test.go b/fuse/node/mount_test.go index a57d63819..743d6cc25 100644 --- a/fuse/node/mount_test.go +++ b/fuse/node/mount_test.go @@ -1,4 +1,4 @@ -// +build !nofuse +// +build !openbsd,!nofuse package node diff --git a/fuse/node/mount_unix.go b/fuse/node/mount_unix.go index 8fee86947..1438cbe8e 100644 --- a/fuse/node/mount_unix.go +++ b/fuse/node/mount_unix.go @@ -1,4 +1,4 @@ -// +build !windows,!nofuse +// +build !windows,!openbsd,!nofuse package node diff --git a/fuse/readonly/ipfs_test.go b/fuse/readonly/ipfs_test.go index bea43d292..7e44ca066 100644 --- a/fuse/readonly/ipfs_test.go +++ b/fuse/readonly/ipfs_test.go @@ -1,4 +1,4 @@ -// +build !nofuse +// +build !nofuse,!openbsd package readonly diff --git a/fuse/readonly/mount_unix.go b/fuse/readonly/mount_unix.go index 656e23c49..6988d8bdf 100644 --- a/fuse/readonly/mount_unix.go +++ b/fuse/readonly/mount_unix.go @@ -1,4 +1,4 @@ -// +build linux darwin freebsd netbsd openbsd +// +build linux darwin freebsd netbsd // +build !nofuse package readonly diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go index ee4708e88..eeba6a1bd 100644 --- a/fuse/readonly/readonly_unix.go +++ b/fuse/readonly/readonly_unix.go @@ -1,4 +1,4 @@ -// +build linux darwin freebsd netbsd openbsd +// +build linux darwin freebsd netbsd // +build !nofuse package readonly diff --git a/mk/util.mk b/mk/util.mk index fa6eae8e4..734640d29 100644 --- a/mk/util.mk +++ b/mk/util.mk @@ -20,8 +20,12 @@ SUPPORTED_PLATFORMS += linux-amd64 SUPPORTED_PLATFORMS += darwin-386 SUPPORTED_PLATFORMS += darwin-amd64 +SUPPORTED_PLATFORMS += freebsd-386 SUPPORTED_PLATFORMS += freebsd-amd64 +SUPPORTED_PLATFORMS += openbsd-386 +SUPPORTED_PLATFORMS += openbsd-amd64 + space:= space+= comma:=,