Merge pull request #3857 from creack/remove_darwin_files

Remove all darwin specific files and use more generic _unsupported with build tags.

Dockerfile

@@ -68,8 +68,9 @@ ENV	GOPATH	/go:/go/src/github.com/dotcloud/docker/vendor
 RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1
 
 # Compile Go for cross compilation
-ENV	DOCKER_CROSSPLATFORMS	darwin/amd64 darwin/386
-# TODO add linux/386 and linux/arm
+ENV	DOCKER_CROSSPLATFORMS	linux/386 linux/arm darwin/amd64 darwin/386
+# (set an explicit GOARM of 5 for maximum compatibility)
+ENV	GOARM	5
 RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
 
 # Grab Go's cover tool for dead-simple code coverage testing

archive/stat_darwin.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package archive
 
 import "syscall"

execdriver/lxc/lxc_init_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package lxc
 
 import (

execdriver/lxc/lxc_init_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package lxc
 
 func setHostname(hostname string) error {

graphdriver/aufs/mount_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package aufs
 
 import "syscall"

graphdriver/aufs/mount_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package aufs
 
 import "errors"

graphdriver/btrfs/btrfs.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package btrfs
 

graphdriver/btrfs/dummy_unsupported.go

@@ -1,3 +1,3 @@
-// +build !linux
+// +build !linux !amd64
 
 package btrfs

graphdriver/devmapper/attach_loopback.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/deviceset.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/devmapper.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/devmapper_log.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/devmapper_test.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/devmapper_wrapper.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/driver.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/driver_test.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/ioctl.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/mount.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

graphdriver/devmapper/sys.go

@@ -1,4 +1,4 @@
-// +build linux
+// +build linux,amd64
 
 package devmapper
 

hack/release.sh

@@ -151,7 +151,8 @@ release_build() {
 			S3ARCH=i386
 			;;
 		arm)
-			# GOARCH is fine
+			S3ARCH=armel
+			# someday, we might potentially support mutliple GOARM values, in which case we might get armhf here too
 			;;
 		*)
 			echo >&2 "error: can't convert $S3ARCH to an appropriate value for 'uname -m'"

pkg/graphdb/conn_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package graphdb
 
 import (

pkg/graphdb/conn_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package graphdb
 
 func NewSqliteConn(root string) (*Database, error) {

pkg/mount/flags_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package mount
 
 import (

pkg/mount/flags_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package mount
 
 func parseOptions(options string) (int, string) {

pkg/mount/mounter_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package mount
 
 import (

pkg/mount/mounter_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package mount
 
 func mount(device, target, mType string, flag uintptr, data string) error {

pkg/netlink/netlink_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package netlink
 
 import (

pkg/netlink/netlink_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package netlink
 
 import (

reflink_copy_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package docker
 
 // FIXME: This could be easily rewritten in pure Go

reflink_copy_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package docker
 
 import (

utils/fs.go

@@ -24,10 +24,12 @@ func TreeSize(dir string) (size int64, err error) {
 
 		// Check inode to handle hard links correctly
 		inode := fileInfo.Sys().(*syscall.Stat_t).Ino
-		if _, exists := data[inode]; exists {
+		// inode is not a uint64 on all platforms. Cast it to avoid issues.
+		if _, exists := data[uint64(inode)]; exists {
 			return nil
 		}
-		data[inode] = false
+		// inode is not a uint64 on all platforms. Cast it to avoid issues.
+		data[uint64(inode)] = false
 
 		size += s
 

utils/uname_linux.go

@@ -1,3 +1,5 @@
+// +build amd64
+
 package utils
 
 import (

utils/uname_unsupported.go

@@ -1,3 +1,5 @@
+// +build !linux !amd64
+
 package utils
 
 import (
@@ -9,5 +11,5 @@ type Utsname struct {
 }
 
 func uname() (*Utsname, error) {
-	return nil, errors.New("Kernel version detection is not available on darwin")
+	return nil, errors.New("Kernel version detection is available only on linux")
 }