Merge pull request #1935 from coypoop/trivial-netbsd-patches

Trivial patches to minimize patches needed by NetBSD
containers · Jun 3, 2024 · 5fe400b · 5fe400b
2 parents 44daeaa + 730997e
commit 5fe400b
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 48 deletions.
diff --git a/drivers/chroot_unix.go b/drivers/chroot_unix.go
@@ -1,5 +1,5 @@
-//go:build linux || darwin || freebsd || solaris
-// +build linux darwin freebsd solaris
+//go:build !windows
+// +build !windows
 
 package graphdriver
 

diff --git a/pkg/archive/archive_bsd.go b/pkg/archive/archive_bsd.go
@@ -1,5 +1,5 @@
-//go:build freebsd || darwin
-// +build freebsd darwin
+//go:build netbsd || freebsd || darwin
+// +build netbsd freebsd darwin
 
 package archive
 

diff --git a/pkg/directory/directory_unix.go b/pkg/directory/directory_unix.go
@@ -1,5 +1,5 @@
-//go:build linux || darwin || freebsd || solaris
-// +build linux darwin freebsd solaris
+//go:build !windows
+// +build !windows
 
 package directory
 

diff --git a/pkg/homedir/homedir_others.go b/pkg/homedir/homedir_others.go
diff --git a/pkg/lockfile/lockfile_unix.go b/pkg/lockfile/lockfile_unix.go
@@ -1,5 +1,5 @@
-//go:build linux || solaris || darwin || freebsd
-// +build linux solaris darwin freebsd
+//go:build !windows
+// +build !windows
 
 package lockfile
 

diff --git a/pkg/system/syscall_unix.go b/pkg/system/syscall_unix.go
@@ -1,5 +1,5 @@
-//go:build linux || freebsd || darwin
-// +build linux freebsd darwin
+//go:build !windows
+// +build !windows
 
 package system
 

diff --git a/types/options_freebsd.go → types/options_bsd.go b/types/options_freebsd.go → types/options_bsd.go
@@ -1,3 +1,5 @@
+//go:build freebsd || netbsd
+
 package types
 
 const (