File docker_remove_journald_to_fix_dynbinary_build_o... of Package docker

Overview Repositories Revisions Requests Users Attributes Meta

File docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch of Package docker (Revision ee886b0f50c6842cd1a1dfa18441c06c)

Currently displaying revision ee886b0f50c6842cd1a1dfa18441c06c , Show latest

From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: docker remove journald to fix dynbinary build on powerpc
Date: Fri, 04 Dec 2015 14:45:43 +0100

docker remove journald to fix dynbinary build on powerpc

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
 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
+// +build linux,!arm 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
+// +build !linux linux,arm 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
+// +build linux,cgo,!static_build,journald,!arm,!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
+// +build !linux !cgo static_build !journald linux,arm linux,ppc64 linux,ppc64le
 
 package journald

Places

File docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch of Package docker (Revision ee886b0f50c6842cd1a1dfa18441c06c)

Places