b348880837
- remove 2 patches and add 5 others after 1.9.1 upgrade
Removed:
docker_missing_ppc64le_netlink_linux_files.patch
docker_rename_jump_amd64_as_jump_linux.patch
Added:
add_bolt_ppc64.patch
add_bolt_arm64.patch
docker_remove_journald_to_fix_dynbinary_build_on_arm.patch
docker_remove_journald_to_fix_dynbinary_build_on_powerpc.patch
docker_remove_journald_to_fix_dynbinary_build_on_arm64.patch
OBS-URL: https://build.opensuse.org/request/show/347470
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=47
54 lines
2.0 KiB
Diff
54 lines
2.0 KiB
Diff
From 6f6f10a75f8b447637e8a89d685452871899e9c0 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>
|
|
|
|
---
|
|
daemon/logger/journald/journald.go | 2 +-
|
|
daemon/logger/journald/journald_unsupported.go | 2 +-
|
|
daemon/logger/journald/read.go | 2 +-
|
|
daemon/logger/journald/read_unsupported.go | 2 +-
|
|
4 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
Index: docker-1.9.1/daemon/logger/journald/journald.go
|
|
===================================================================
|
|
--- docker-1.9.1.orig/daemon/logger/journald/journald.go
|
|
+++ docker-1.9.1/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.
|
|
Index: docker-1.9.1/daemon/logger/journald/journald_unsupported.go
|
|
===================================================================
|
|
--- docker-1.9.1.orig/daemon/logger/journald/journald_unsupported.go
|
|
+++ docker-1.9.1/daemon/logger/journald/journald_unsupported.go
|
|
@@ -1,3 +1,3 @@
|
|
-// +build !linux
|
|
+// +build !linux linux,arm
|
|
|
|
package journald
|
|
Index: docker-1.9.1/daemon/logger/journald/read.go
|
|
===================================================================
|
|
--- docker-1.9.1.orig/daemon/logger/journald/read.go
|
|
+++ docker-1.9.1/daemon/logger/journald/read.go
|
|
@@ -1,4 +1,4 @@
|
|
-// +build linux,cgo,!static_build,journald
|
|
+// +build linux,cgo,!static_build,journald,!arm
|
|
|
|
package journald
|
|
|
|
Index: docker-1.9.1/daemon/logger/journald/read_unsupported.go
|
|
===================================================================
|
|
--- docker-1.9.1.orig/daemon/logger/journald/read_unsupported.go
|
|
+++ docker-1.9.1/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
|
|
|