diff options
| author |   mudler <mudler@dark-lab.net> | 2015-11-21 12:52:18 +0100 |
|---|---|---|
| committer |   Kacper Kowalik <xarthisius@gentoo.org> | 2015-11-24 10:43:00 -0600 |
| commit | c32a35e8d8fea39c1445a6880656f850b110f4f7 (patch) | |
| tree | 8432236964b10d8003f8ae5b43775d8578a635ff /app-emulation/docker/files | |
| parent | sys-apps/systemd: Remove old (diff) | |
| download | gentoo-c32a35e8d8fea39c1445a6880656f850b110f4f7.tar.gz gentoo-c32a35e8d8fea39c1445a6880656f850b110f4f7.tar.bz2 gentoo-c32a35e8d8fea39c1445a6880656f850b110f4f7.zip | |
app-emulation/docker: version bump, fixes #566432
Diffstat (limited to 'app-emulation/docker/files')
| -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 000000000000..e7c9a2f675f8 --- /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 + |