diff --git a/docker.changes b/docker.changes index b61f63e..ca9aa3b 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 26 14:02:47 UTC 2015 - normand@linux.vnet.ibm.com + +- new patch to avoid ppc64le build error + docker_missing_ppc64le_netlink_linux_files.patch + ------------------------------------------------------------------- Mon Oct 12 20:28:46 UTC 2015 - fcastelli@suse.com diff --git a/docker.spec b/docker.spec index 1132367..cd9b09b 100644 --- a/docker.spec +++ b/docker.spec @@ -51,6 +51,7 @@ Patch2: fix_15279.patch Patch100: ignore-dockerinit-checksum.patch Patch101: gcc-go-build-static-libgo.patch Patch102: docker_rename_jump_amd64_as_jump_linux.patch +Patch103: docker_missing_ppc64le_netlink_linux_files.patch BuildRequires: bash-completion BuildRequires: device-mapper-devel >= 1.2.68 BuildRequires: glibc-devel-static @@ -147,6 +148,7 @@ Test package for docker. It contains the source code and the tests. %patch100 -p1 %patch101 -p0 %patch102 -p1 +%patch103 -p1 %endif cp %{SOURCE7} . diff --git a/docker_missing_ppc64le_netlink_linux_files.patch b/docker_missing_ppc64le_netlink_linux_files.patch new file mode 100644 index 0000000..b2808fd --- /dev/null +++ b/docker_missing_ppc64le_netlink_linux_files.patch @@ -0,0 +1,61 @@ +From: Michel Normand +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 +--- + 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 +