From 8f5a861b89bbbdc0f011a1ae75ffc22b15897041 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>
Upstream-commit: 6f6f10a75f8b447637e8a89d685452871899e9c0
Component: engine
---
 components/engine/daemon/logger/journald/journald.go            | 2 +-
 .../engine/daemon/logger/journald/journald_unsupported.go       | 2 +-
 components/engine/daemon/logger/journald/read.go                | 2 +-
 components/engine/daemon/logger/journald/read_unsupported.go    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/engine/daemon/logger/journald/journald.go b/components/engine/daemon/logger/journald/journald.go
index c729b56d19..97c379c35e 100644
--- a/components/engine/daemon/logger/journald/journald.go
+++ b/components/engine/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.
diff --git a/components/engine/daemon/logger/journald/journald_unsupported.go b/components/engine/daemon/logger/journald/journald_unsupported.go
index d52ca92e4f..8e9034aea5 100644
--- a/components/engine/daemon/logger/journald/journald_unsupported.go
+++ b/components/engine/daemon/logger/journald/journald_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux linux,arm
 
 package journald
 
diff --git a/components/engine/daemon/logger/journald/read.go b/components/engine/daemon/logger/journald/read.go
index 80c1fbda7a..0477c042ae 100644
--- a/components/engine/daemon/logger/journald/read.go
+++ b/components/engine/daemon/logger/journald/read.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,!static_build,journald
+// +build linux,cgo,!static_build,journald,!arm
 
 package journald
 
diff --git a/components/engine/daemon/logger/journald/read_unsupported.go b/components/engine/daemon/logger/journald/read_unsupported.go
index b43abdcaf7..35aa7c38ae 100644
--- a/components/engine/daemon/logger/journald/read_unsupported.go
+++ b/components/engine/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