From 7b9ebed75dc7f2d7986909fb3026b538238ccc0d Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 29 Mar 2017 14:04:43 -0700 Subject: [PATCH 1/3] plugins: Rename plugins_linux.go to plugins_unix.go and use build tags This allows pkg/authorization to build on OS X. Signed-off-by: Aaron Lehmann Upstream-commit: 3da119282806187079b1a6dfdfb0de7631a78647 Component: engine --- .../engine/pkg/plugins/{plugins_linux.go => plugins_unix.go} | 2 ++ 1 file changed, 2 insertions(+) rename components/engine/pkg/plugins/{plugins_linux.go => plugins_unix.go} (91%) diff --git a/components/engine/pkg/plugins/plugins_linux.go b/components/engine/pkg/plugins/plugins_unix.go similarity index 91% rename from components/engine/pkg/plugins/plugins_linux.go rename to components/engine/pkg/plugins/plugins_unix.go index 9c5a0b5632..02f1da69a1 100644 --- a/components/engine/pkg/plugins/plugins_linux.go +++ b/components/engine/pkg/plugins/plugins_unix.go @@ -1,3 +1,5 @@ +// +build !windows + package plugins // BasePath returns the path to which all paths returned by the plugin are relative to. From eb7698949e6f8d4d148fc888679ba0bd7209ab35 Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 29 Mar 2017 15:58:03 -0700 Subject: [PATCH 2/3] Add line to hack/make/cross to cross-compile pkgs directory Signed-off-by: Aaron Lehmann Upstream-commit: 8eb7edab7cc62bcbf581713f3f1e615cfdef04b4 Component: engine --- components/engine/hack/make/cross | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/components/engine/hack/make/cross b/components/engine/hack/make/cross index d4dbb369a6..94d2ddf678 100644 --- a/components/engine/hack/make/cross +++ b/components/engine/hack/make/cross @@ -31,6 +31,11 @@ for platform in $DOCKER_CROSSPLATFORMS; do if [ "$GOOS" != "solaris" ]; then # TODO. Solaris cannot be cross build because of CGO calls. + + # go install docker/docker/pkg packages to ensure that + # they build cross platform. + go install github.com/docker/docker/pkg/... + if [ -z "${daemonSupporting[$platform]}" ]; then # we just need a simple client for these platforms export LDFLAGS_STATIC_DOCKER="" From ebb760e3cd8488e6c3ad4b4601912400daaa0dbd Mon Sep 17 00:00:00 2001 From: Aaron Lehmann Date: Wed, 29 Mar 2017 17:55:42 -0700 Subject: [PATCH 3/3] Make pkg/devicemapper and pkg/loopback depend on cgo in build tags Signed-off-by: Aaron Lehmann Upstream-commit: 85357a1167f22be9606b770a872339df459af490 Component: engine --- components/engine/pkg/devicemapper/devmapper.go | 2 +- components/engine/pkg/devicemapper/devmapper_log.go | 2 +- components/engine/pkg/devicemapper/devmapper_wrapper.go | 2 +- .../pkg/devicemapper/devmapper_wrapper_deferred_remove.go | 2 +- .../pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go | 2 +- components/engine/pkg/devicemapper/ioctl.go | 2 +- components/engine/pkg/loopback/attach_loopback.go | 2 +- components/engine/pkg/loopback/ioctl.go | 2 +- components/engine/pkg/loopback/loop_wrapper.go | 2 +- components/engine/pkg/loopback/loopback.go | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/components/engine/pkg/devicemapper/devmapper.go b/components/engine/pkg/devicemapper/devmapper.go index d970c542c9..07161d43e8 100644 --- a/components/engine/pkg/devicemapper/devmapper.go +++ b/components/engine/pkg/devicemapper/devmapper.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package devicemapper diff --git a/components/engine/pkg/devicemapper/devmapper_log.go b/components/engine/pkg/devicemapper/devmapper_log.go index 8477e36fec..7dd0c60891 100644 --- a/components/engine/pkg/devicemapper/devmapper_log.go +++ b/components/engine/pkg/devicemapper/devmapper_log.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package devicemapper diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper.go b/components/engine/pkg/devicemapper/devmapper_wrapper.go index 91fbc85b3a..4f270fba0b 100644 --- a/components/engine/pkg/devicemapper/devmapper_wrapper.go +++ b/components/engine/pkg/devicemapper/devmapper_wrapper.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package devicemapper diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go index dc361eab76..5bdd97d9c0 100644 --- a/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go +++ b/components/engine/pkg/devicemapper/devmapper_wrapper_deferred_remove.go @@ -1,4 +1,4 @@ -// +build linux,!libdm_no_deferred_remove +// +build linux,cgo,!libdm_no_deferred_remove package devicemapper diff --git a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go index 8249ccf854..968b2ce0c0 100644 --- a/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go +++ b/components/engine/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go @@ -1,4 +1,4 @@ -// +build linux,libdm_no_deferred_remove +// +build linux,cgo,libdm_no_deferred_remove package devicemapper diff --git a/components/engine/pkg/devicemapper/ioctl.go b/components/engine/pkg/devicemapper/ioctl.go index 581b57eb86..b745291442 100644 --- a/components/engine/pkg/devicemapper/ioctl.go +++ b/components/engine/pkg/devicemapper/ioctl.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package devicemapper diff --git a/components/engine/pkg/loopback/attach_loopback.go b/components/engine/pkg/loopback/attach_loopback.go index 971f45eb48..dafa94bede 100644 --- a/components/engine/pkg/loopback/attach_loopback.go +++ b/components/engine/pkg/loopback/attach_loopback.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package loopback diff --git a/components/engine/pkg/loopback/ioctl.go b/components/engine/pkg/loopback/ioctl.go index 0714eb5f87..ea6841958d 100644 --- a/components/engine/pkg/loopback/ioctl.go +++ b/components/engine/pkg/loopback/ioctl.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package loopback diff --git a/components/engine/pkg/loopback/loop_wrapper.go b/components/engine/pkg/loopback/loop_wrapper.go index e1100ce156..a50de7f07a 100644 --- a/components/engine/pkg/loopback/loop_wrapper.go +++ b/components/engine/pkg/loopback/loop_wrapper.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package loopback diff --git a/components/engine/pkg/loopback/loopback.go b/components/engine/pkg/loopback/loopback.go index bc0479284c..c2d91da6f0 100644 --- a/components/engine/pkg/loopback/loopback.go +++ b/components/engine/pkg/loopback/loopback.go @@ -1,4 +1,4 @@ -// +build linux +// +build linux,cgo package loopback