File docker_remove_journald_to_fix_dynbinary_build_o... of Package docker.6280

Overview Repositories Revisions Requests Users Attributes Meta

File docker_remove_journald_to_fix_dynbinary_build_on_arm.patch of Package docker.6280

From 6f6f10a75f8b447637e8a89d685452871899e9c0 Mon Sep 17 00:00:00 2001
From: Stefan Scherer <scherer_stefan@icloud.com>
Date: Thu, 19 Nov 2015 17:09:20 +0100
Subject: [PATCH] prevent journald from being built on ARM

Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.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
+// +build linux,!arm
 
 // 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
+// +build !linux linux,arm
 
 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
+// +build linux,cgo,!static_build,journald,!arm
 
 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
+// +build !linux !cgo static_build !journald linux,arm
 
 package journald

Places

File docker_remove_journald_to_fix_dynbinary_build_on_arm.patch of Package docker.6280

Places