Remove solaris build tag and `contrib/mkimage/solaris

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4785f1a7ab7ec857dc3ca849ee6ecadf519ef30e
Component: engine
This commit is contained in:
Yong Tang
2017-11-02 00:01:46 +00:00
parent 7559d4940b
commit eefbd135ae
61 changed files with 51 additions and 172 deletions
@@ -1,4 +1,4 @@
// +build linux freebsd solaris
// +build linux freebsd
package directory
@@ -1,4 +1,4 @@
// +build !linux,!freebsd freebsd,!cgo solaris,!cgo
// +build !linux,!freebsd freebsd,!cgo
package mount
+1 -1
View File
@@ -13,7 +13,7 @@ func GetMounts() ([]*Info, error) {
}
// Mounted determines if a specified mountpoint has been mounted.
// On Linux it looks at /proc/self/mountinfo and on Solaris at mnttab.
// On Linux it looks at /proc/self/mountinfo.
func Mounted(mountpoint string) (bool, error) {
entries, err := parseMountTable()
if err != nil {
@@ -1,4 +1,4 @@
// +build !windows,!solaris
// +build !windows
package mount
@@ -1,4 +1,4 @@
// +build !linux,!freebsd,!solaris freebsd,!cgo solaris,!cgo
// +build !linux,!freebsd freebsd,!cgo
package mount
@@ -1,4 +1,4 @@
// +build !windows,!linux,!freebsd,!solaris freebsd,!cgo solaris,!cgo
// +build !windows,!linux,!freebsd freebsd,!cgo
package mount
@@ -1,4 +1,4 @@
// +build linux freebsd solaris openbsd
// +build linux freebsd openbsd
// Package kernel provides helper function to get, parse and compare kernel
// versions for different platforms.
@@ -1,4 +1,4 @@
// +build !linux,!solaris
// +build !linux
package kernel
@@ -1,4 +1,4 @@
// +build freebsd solaris darwin
// +build freebsd darwin
// Package platform provides helper function to get the runtime architecture
// for different platforms.
+1 -1
View File
@@ -1,4 +1,4 @@
// +build freebsd solaris darwin
// +build freebsd darwin
package reexec
@@ -1,4 +1,4 @@
// +build !linux,!windows,!freebsd,!solaris,!darwin
// +build !linux,!windows,!freebsd,!darwin
package reexec
@@ -6,7 +6,7 @@ import (
"os/exec"
)
// Command is unsupported on operating systems apart from Linux, Windows, Solaris and Darwin.
// Command is unsupported on operating systems apart from Linux, Windows, and Darwin.
func Command(args ...string) *exec.Cmd {
return nil
}
@@ -1,4 +1,4 @@
// +build darwin linux solaris
// +build darwin linux
package signal
@@ -1,4 +1,4 @@
// +build !linux,!darwin,!freebsd,!windows,!solaris
// +build !linux,!darwin,!freebsd,!windows
package signal
@@ -1,8 +1,8 @@
// +build !linux,!solaris,!windows
// +build !linux,!windows
package sysinfo
// New returns an empty SysInfo for non linux nor solaris for now.
// New returns an empty SysInfo for non linux for now.
func New(quiet bool) *SysInfo {
sysInfo := &SysInfo{}
return sysInfo
@@ -1,4 +1,4 @@
// +build !linux,!windows,!solaris
// +build !linux,!windows
package system
+1 -1
View File
@@ -1,4 +1,4 @@
// +build linux freebsd solaris darwin
// +build linux freebsd darwin
package system
-1
View File
@@ -1,5 +1,4 @@
// +build !windows
// +build !solaris !cgo
package term
+1 -1
View File
@@ -1,4 +1,4 @@
// +build !solaris,!windows
// +build !windows
package term