c2bb76f4bf
- new patch to avoid ppc64le build error docker_missing_ppc64le_netlink_linux_files.patch OBS-URL: https://build.opensuse.org/request/show/341015 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=41
62 lines
3.0 KiB
Diff
62 lines
3.0 KiB
Diff
From: Michel Normand <normand@linux.vnet.ibm.com>
|
|
Subject: docker missing ppc64le netlink linux files
|
|
Date: Mon, 26 Oct 2015 15:00:07 +0100
|
|
|
|
docker missing ppc64le netlink linux files
|
|
patch to avoid build error like:
|
|
===
|
|
[ 29s] # github.com/opencontainers/runc/libcontainer/netlink
|
|
[ 29s] vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux.go:1260:26: error: incompatible types in assignment (cannot use type int8 as type uint8)
|
|
[ 29s] ifr.IfruHwaddr.Data[i] = ifrDataByte(hw[i])
|
|
[ 29s] ^
|
|
===
|
|
|
|
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
|
|
---
|
|
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 +-
|
|
vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_armppc64.go | 2 +-
|
|
vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_notarm.go | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: docker-1.8.3/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_armppc64.go
|
|
===================================================================
|
|
--- docker-1.8.3.orig/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_armppc64.go
|
|
+++ docker-1.8.3/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_armppc64.go
|
|
@@ -1,4 +1,4 @@
|
|
-// +build arm ppc64
|
|
+// +build arm ppc64 ppc64le
|
|
|
|
package netlink
|
|
|
|
Index: docker-1.8.3/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_notarm.go
|
|
===================================================================
|
|
--- docker-1.8.3.orig/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_notarm.go
|
|
+++ docker-1.8.3/vendor/src/github.com/opencontainers/runc/libcontainer/netlink/netlink_linux_notarm.go
|
|
@@ -1,4 +1,4 @@
|
|
-// +build !arm,!ppc64
|
|
+// +build !arm,!ppc64,!ppc64le
|
|
|
|
package netlink
|
|
|
|
Index: docker-1.8.3/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
|
|
===================================================================
|
|
--- docker-1.8.3.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
|
|
+++ docker-1.8.3/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
|
|
@@ -1,4 +1,4 @@
|
|
-// +build arm ppc64
|
|
+// +build arm ppc64 ppc64le
|
|
|
|
package bridge
|
|
|
|
Index: docker-1.8.3/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
|
|
===================================================================
|
|
--- docker-1.8.3.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
|
|
+++ docker-1.8.3/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
|
|
@@ -1,4 +1,4 @@
|
|
-// +build !arm,!ppc64
|
|
+// +build !arm,!ppc64,!ppc64le
|
|
|
|
package bridge
|
|
|