Accepting request 367638 from home:michel_mno:branches:Virtualization:containers

- more patches to build on ppc64 architecture
  update netlink_gcc_go.patch
  new netlink_netns_powerpc.patch
  new boltdb_bolt_powerpc.patch
  new libnetwork_drivers_bridge_powerpc.patch to replace
      deleted fix-ppc64le.patch

OBS-URL: https://build.opensuse.org/request/show/367638
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=81

boltdb_bolt_powerpc.patch

@@ -0,0 +1,18 @@
+---
+ vendor/src/github.com/boltdb/bolt/bolt_ppc64.go |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: docker-1.10.2/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+===================================================================
+--- /dev/null
++++ docker-1.10.2/vendor/src/github.com/boltdb/bolt/bolt_ppc64.go
+@@ -0,0 +1,9 @@
++// +build ppc64
++
++package bolt
++
++// maxMapSize represents the largest mmap size supported by Bolt.
++const maxMapSize = 0xFFFFFFFFFFFF // 256TB
++
++// maxAllocSize is the size used when creating array pointers.
++const maxAllocSize = 0x7FFFFFFF

docker.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Mar  7 14:09:17 UTC 2016 - normand@linux.vnet.ibm.com
+
+- more patches to build on ppc64 architecture
+  update netlink_gcc_go.patch
+  new netlink_netns_powerpc.patch
+  new boltdb_bolt_powerpc.patch
+  new libnetwork_drivers_bridge_powerpc.patch to replace
+      deleted fix-ppc64le.patch
+
 -------------------------------------------------------------------
 Mon Mar  7 11:48:01 UTC 2016 - asarai@suse.com
 

docker.spec

@@ -52,8 +52,9 @@ Patch3:         fix-apparmor.patch
 Patch100:       ignore-dockerinit-checksum.patch
 Patch101:       gcc-go-patches.patch
 Patch102:       netlink_gcc_go.patch
-#TODO: rename this patch later on
+Patch103:       netlink_netns_powerpc.patch
-Patch108:       fix-ppc64le.patch
+Patch104:       boltdb_bolt_powerpc.patch
+Patch105:       libnetwork_drivers_bridge_powerpc.patch
 BuildRequires:  audit
 BuildRequires:  bash-completion
 BuildRequires:  device-mapper-devel >= 1.2.68
@@ -161,8 +162,10 @@ Test package for docker. It contains the source code and the tests.
 %patch3 -p1
 %ifnarch %go_arches
 %patch101 -p1
-%patch108 -p1
 %patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
 %patch100 -p1
 %endif
 cp %{SOURCE7} .

fix-ppc64le.patch

@@ -1,20 +0,0 @@
-Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
-===================================================================
---- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
-+++ docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
-@@ -1,4 +1,4 @@
--// +build arm ppc64 ppc64le
-+// +build arm ppc64,!ppc64le
- 
- package bridge
- 
-Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
-===================================================================
---- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
-+++ docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
-@@ -1,4 +1,4 @@
--// +build !arm,!ppc64,!ppc64le
-+// +build !arm,!ppc64 ppc64le
- 
- package bridge
- 

libnetwork_drivers_bridge_powerpc.patch

@@ -0,0 +1,25 @@
+---
+ vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go |    2 +-
+ vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go   |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
+===================================================================
+--- docker-1.10.2.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
++++ docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
+@@ -1,4 +1,4 @@
+-// +build arm ppc64 ppc64le
++// +build arm,!ppc64,!ppc64le
+ 
+ package bridge
+ 
+Index: docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
+===================================================================
+--- docker-1.10.2.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
++++ docker-1.10.2/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
+@@ -1,4 +1,4 @@
+-// +build !arm,!ppc64,!ppc64le
++// +build !arm ppc64 ppc64le
+ 
+ package bridge
+ 

netlink_gcc_go.patch

@@ -31,14 +31,14 @@ index 0000000..feb6070
 +	syscall_TUNSETIFF     = 0x400454ca
 +	syscall_TUNSETPERSIST = 0x400454ca
 +)
-diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go b/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go
+diff --git a/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
 new file mode 100644
 index 0000000..fac7c06
 --- /dev/null
-+++ b/vendor/src/github.com/vishvananda/netlink/link_linux_ppc64le.go
++++ b/vendor/src/github.com/vishvananda/netlink/link_linux_powerpc.go
 @@ -0,0 +1,9 @@
 +// +build linux
-+// +build ppc64le
++// +build ppc64 ppc64le
 +
 +package netlink
 +

netlink_netns_powerpc.patch

@@ -0,0 +1,16 @@
+---
+ vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+Index: docker-1.10.2/vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go
+===================================================================
+--- /dev/null
++++ docker-1.10.2/vendor/src/github.com/vishvananda/netns/netns_linux_ppc64.go
+@@ -0,0 +1,7 @@
++// +build linux,ppc64
++
++package netns
++
++const (
++	SYS_SETNS = 350
++)