diff options
| author | Ghiunhan Mamut (aka V3n3RiX) <venerix@rogentos.ro> | 2016-04-05 17:26:20 +0000 |
|---|---|---|
| committer | Ghiunhan Mamut (aka V3n3RiX) <venerix@rogentos.ro> | 2016-04-05 17:26:20 +0000 |
| commit | a8dce448298c7ed33bb260eefbe38fced3769e20 (patch) | |
| tree | cc428410bc2f622c7cc30215a8e6d5424f94375f /app-emulation/docker/files/18074-disable-journald-arm.patch | |
| parent | 9a2f8110322c3c3b3beb6e16f1d5253da1f53e89 (diff) | |
| parent | fc83dad4ca029bc14eec9abf3fda47d551e99453 (diff) | |
Merge branch 'master' into 'master'
[docker] added docker to the repo. included support for our binary kernel and systemd
See merge request !3
Diffstat (limited to 'app-emulation/docker/files/18074-disable-journald-arm.patch')
| -rw-r--r-- | app-emulation/docker/files/18074-disable-journald-arm.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/app-emulation/docker/files/18074-disable-journald-arm.patch b/app-emulation/docker/files/18074-disable-journald-arm.patch new file mode 100644 index 00000000..e7c9a2f6 --- /dev/null +++ b/app-emulation/docker/files/18074-disable-journald-arm.patch @@ -0,0 +1,30 @@ +diff --git a/daemon/logger/journald/journald.go b/daemon/logger/journald/journald.go +index c729b56..97c379c 100644 +--- a/daemon/logger/journald/journald.go ++++ b/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/daemon/logger/journald/journald_unsupported.go b/daemon/logger/journald/journald_unsupported.go +index d52ca92..8e9034a 100644 +--- a/daemon/logger/journald/journald_unsupported.go ++++ b/daemon/logger/journald/journald_unsupported.go +@@ -1,4 +1,4 @@ +-// +build !linux ++// +build !linux linux,arm + + package journald + +diff --git a/daemon/logger/journald/read.go b/daemon/logger/journald/read.go +index 80c1fbd..0477c04 100644 +--- a/daemon/logger/journald/read.go ++++ b/daemon/logger/journald/read.go +@@ -1,4 +1,4 @@ +-// +build linux,cgo,!static_build,journald ++// +build linux,cgo,!static_build,journald,!arm + + package journald + |