From: Michel Normand Subject: docker remove journald to fix dynbinary build on arm64 Date: Fri, 04 Dec 2015 17:07:12 +0100 docker remove journald to fix dynbinary build on arm64 Signed-off-by: Michel Normand --- daemon/logger/journald/journald.go | 2 +- daemon/logger/journald/journald_unsupported.go | 2 +- daemon/logger/journald/read.go | 2 +- daemon/logger/journald/read_unsupported.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) Index: docker-1.9.1/daemon/logger/journald/journald.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald.go +++ docker-1.9.1/daemon/logger/journald/journald.go @@ -1,4 +1,4 @@ -// +build linux,!arm linux,!ppc64 linux,!ppc64le +// +build linux,!arm linux,!arm64 linux,!ppc64 linux,!ppc64le // Package journald provides the log driver for forwarding server logs // to endpoints that receive the systemd format. Index: docker-1.9.1/daemon/logger/journald/journald_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/journald_unsupported.go +++ docker-1.9.1/daemon/logger/journald/journald_unsupported.go @@ -1,3 +1,3 @@ -// +build !linux linux,arm linux,ppc64 linux,ppc64le +// +build !linux linux,arm linux,arm64 linux,ppc64 linux,ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read.go +++ docker-1.9.1/daemon/logger/journald/read.go @@ -1,4 +1,4 @@ -// +build linux,cgo,!static_build,journald,!arm,!ppc64,!ppc64le +// +build linux,cgo,!static_build,journald,!arm,!arm64,!ppc64,!ppc64le package journald Index: docker-1.9.1/daemon/logger/journald/read_unsupported.go =================================================================== --- docker-1.9.1.orig/daemon/logger/journald/read_unsupported.go +++ docker-1.9.1/daemon/logger/journald/read_unsupported.go @@ -1,4 +1,4 @@ -// +build !linux !cgo static_build !journald linux,arm linux,ppc64 linux,ppc64le +// +build !linux !cgo static_build !journald linux,arm linux,arm64 linux,ppc64 linux,ppc64le package journald