From 0af651da2710263b225c36f9c6fc903fbf6f292c Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 31 Jan 2014 03:16:42 -0700 Subject: [PATCH] Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries Docker-DCO-1.1-Signed-off-by: Andrew Page (github: tianon) --- graphdb/conn_linux.go | 2 ++ graphdb/{conn_darwin.go => conn_unsupported.go} | 2 ++ mount/flags_linux.go | 2 ++ mount/flags_unsupported.go | 3 ++- mount/mounter_linux.go | 2 ++ mount/mounter_unsupported.go | 3 ++- netlink/netlink_linux.go | 2 ++ netlink/netlink_unsupported.go | 3 ++- 8 files changed, 16 insertions(+), 3 deletions(-) rename graphdb/{conn_darwin.go => conn_unsupported.go} (79%) diff --git a/graphdb/conn_linux.go b/graphdb/conn_linux.go index 2bd5194..7a1ab8c 100644 --- a/graphdb/conn_linux.go +++ b/graphdb/conn_linux.go @@ -1,3 +1,5 @@ +// +build amd64 + package graphdb import ( diff --git a/graphdb/conn_darwin.go b/graphdb/conn_unsupported.go similarity index 79% rename from graphdb/conn_darwin.go rename to graphdb/conn_unsupported.go index 6e75fd8..c2d6025 100644 --- a/graphdb/conn_darwin.go +++ b/graphdb/conn_unsupported.go @@ -1,3 +1,5 @@ +// +build !linux !amd64 + package graphdb func NewSqliteConn(root string) (*Database, error) { diff --git a/mount/flags_linux.go b/mount/flags_linux.go index 6f4c7ac..e2e1f91 100644 --- a/mount/flags_linux.go +++ b/mount/flags_linux.go @@ -1,3 +1,5 @@ +// +build amd64 + package mount import ( diff --git a/mount/flags_unsupported.go b/mount/flags_unsupported.go index d0b59a6..c894efe 100644 --- a/mount/flags_unsupported.go +++ b/mount/flags_unsupported.go @@ -1,4 +1,5 @@ -// +build: !linux !amd64 +// +build !linux !amd64 + package mount func parseOptions(options string) (int, string) { diff --git a/mount/mounter_linux.go b/mount/mounter_linux.go index dd4280c..70b7798 100644 --- a/mount/mounter_linux.go +++ b/mount/mounter_linux.go @@ -1,3 +1,5 @@ +// +build amd64 + package mount import ( diff --git a/mount/mounter_unsupported.go b/mount/mounter_unsupported.go index 1dd7458..ee27b35 100644 --- a/mount/mounter_unsupported.go +++ b/mount/mounter_unsupported.go @@ -1,4 +1,5 @@ -// +build: !linux !amd64 +// +build !linux !amd64 + package mount func mount(device, target, mType string, flag uintptr, data string) error { diff --git a/netlink/netlink_linux.go b/netlink/netlink_linux.go index ab572e3..0ea5b4d 100644 --- a/netlink/netlink_linux.go +++ b/netlink/netlink_linux.go @@ -1,3 +1,5 @@ +// +build amd64 + package netlink import ( diff --git a/netlink/netlink_unsupported.go b/netlink/netlink_unsupported.go index 3fa0c1e..cd796b3 100644 --- a/netlink/netlink_unsupported.go +++ b/netlink/netlink_unsupported.go @@ -1,4 +1,5 @@ -// +build: !linux !amd64 +// +build !linux !amd64 + package netlink import (