Revert "prevent journald from being built on ARM"

nalind · nalind · commit 0ca6d77e6e17 · 2015-12-02T10:30:13.000-05:00
This reverts commit 6f6f10a, so that we can apply a different workaround. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go
@@ -1,4 +1,4 @@
-// +build linux,!arm
+// +build linux
 
 // Package journald provides the log driver for forwarding server logs
 // to endpoints that receive the systemd format.
diff --git a/daemon/logger/journald/journald_unsupported.go b/daemon/logger/journald/journald_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux linux,arm
+// +build !linux
 
 package journald
 
diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go
@@ -1,4 +1,4 @@
-// +build linux,cgo,!static_build,journald,!arm
+// +build linux,cgo,!static_build,journald
 
 package journald
 
diff --git a/daemon/logger/journald/read_unsupported.go b/daemon/logger/journald/read_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux !cgo static_build !journald linux,arm
+// +build !linux !cgo static_build !journald
 
 package journald
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux,!arm`
	`1`	`+// +build linux`
`2`	`2`
`3`	`3`	`// Package journald provides the log driver for forwarding server logs`
`4`	`4`	`// to endpoints that receive the systemd format.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build linux,cgo,!static_build,journald,!arm`
	`1`	`+// +build linux,cgo,!static_build,journald`
`2`	`2`
`3`	`3`	`package journald`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// +build !linux !cgo static_build !journald linux,arm`
	`1`	`+// +build !linux !cgo static_build !journald`
`2`	`2`
`3`	`3`	`package journald`
`4`	`4`