Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix {net,open}bsd build by disabling fuse on openbsd #6535

Merged
merged 2 commits into from
Jul 22, 2019
Merged

fix {net,open}bsd build by disabling fuse on openbsd #6535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94bbc1c
fix openbsd build by disabling fuse on openbsd
Stebalien Jul 21, 2019
90c656d
fix netbsd build
Stebalien Jul 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fuse/ipns/ipns_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !nofuse
// +build !nofuse,!openbsd,!netbsd

package ipns

Expand Down
2 changes: 1 addition & 1 deletion fuse/ipns/ipns_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !nofuse
// +build !nofuse,!openbsd,!netbsd

// package fuse/ipns implements a fuse filesystem that interfaces
// with ipns, the naming system for ipfs.
Expand Down
2 changes: 1 addition & 1 deletion fuse/ipns/link_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !nofuse
// +build !nofuse,!openbsd,!netbsd

package ipns

Expand Down
3 changes: 1 addition & 2 deletions fuse/mount/fuse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// +build !nofuse
// +build !windows
// +build !nofuse,!windows,!openbsd,!netbsd

package mount

Expand Down
13 changes: 13 additions & 0 deletions fuse/node/mount_notsupp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// +build !nofuse,openbsd !nofuse,netbsd

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 or NetBSD. See #5334 (https://git.io/fjMuC).")
}
2 changes: 1 addition & 1 deletion fuse/node/mount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !nofuse
// +build !openbsd,!nofuse,!netbsd

package node

Expand Down
2 changes: 1 addition & 1 deletion fuse/node/mount_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !windows,!nofuse
// +build !windows,!openbsd,!netbsd,!nofuse

package node

Expand Down
2 changes: 1 addition & 1 deletion fuse/readonly/ipfs_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build !nofuse
// +build !nofuse,!openbsd,!netbsd

package readonly

Expand Down
2 changes: 1 addition & 1 deletion fuse/readonly/mount_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux darwin freebsd netbsd openbsd
// +build linux darwin freebsd
// +build !nofuse

package readonly
Expand Down
2 changes: 1 addition & 1 deletion fuse/readonly/readonly_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// +build linux darwin freebsd netbsd openbsd
// +build linux darwin freebsd
// +build !nofuse

package readonly
Expand Down
7 changes: 7 additions & 0 deletions mk/util.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,15 @@ 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

SUPPORTED_PLATFORMS += netbsd-386
SUPPORTED_PLATFORMS += netbsd-amd64

space:=
space+=
comma:=,
Expand Down