diff options
| author | BlackNoxis <steven.darklight@gmail.com> | 2016-04-02 12:17:01 +0300 |
|---|---|---|
| committer | BlackNoxis <steven.darklight@gmail.com> | 2016-04-02 12:17:01 +0300 |
| commit | 3c1016376d4761ecca61e5d4c43bbd3e4ba180bc (patch) | |
| tree | 0e6966b6a2922aea7b28c506d79345aa3923968c /app-emulation/docker/files/18074-disable-journald-arm.patch | |
| parent | 9a2f8110322c3c3b3beb6e16f1d5253da1f53e89 (diff) | |
[docker] added docker to the repo. included support for our binary kernel and systemd
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 + |