From eecf6cd48cf7c48f00aa8261cf431c87084161ae Mon Sep 17 00:00:00 2001 From: Srini Brahmaroutu Date: Tue, 25 Aug 2015 15:06:58 +0000 Subject: [PATCH] Allow vendoring netns change to build Docker on s390x Signed-off-by: Srini Brahmaroutu --- hack/vendor.sh | 2 +- .../src/github.com/vishvananda/netns/netns_linux_s390x.go | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 vendor/src/github.com/vishvananda/netns/netns_linux_s390x.go diff --git a/hack/vendor.sh b/hack/vendor.sh index ad0304c5b8..928e3b725f 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -27,7 +27,7 @@ clone git github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece581016509 clone git github.com/hashicorp/memberlist 9a1e242e454d2443df330bdd51a436d5a9058fc4 clone git github.com/hashicorp/serf 7151adcef72687bf95f451a2e0ba15cb19412bf2 clone git github.com/docker/libkv 60c7c881345b3c67defc7f93a8297debf041d43c -clone git github.com/vishvananda/netns 493029407eeb434d0c2d44e02ea072ff2488d322 +clone git github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25 clone git github.com/vishvananda/netlink 4b5dce31de6d42af5bb9811c6d265472199e0fec clone git github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060 clone git github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374 diff --git a/vendor/src/github.com/vishvananda/netns/netns_linux_s390x.go b/vendor/src/github.com/vishvananda/netns/netns_linux_s390x.go new file mode 100644 index 0000000000..cc13e62665 --- /dev/null +++ b/vendor/src/github.com/vishvananda/netns/netns_linux_s390x.go @@ -0,0 +1,7 @@ +// +build linux,s390x + +package netns + +const ( + SYS_SETNS = 339 +)