3e758ad610
- boltdb_bolt_powerpc.patch - fix-apparmor.patch - fix-btrfs-ioctl-structure.patch - fix-docker-init.patch - libnetwork_drivers_bridge_powerpc.patch - ignore-dockerinit-checksum.patch * Require containerd, as it is the only currently supported Docker execdriver. * Update docker.socket to require containerd.socket and use --containerd in docker.service so that the services are self-contained. * Update to Docker 1.11.0. OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=97
45 lines
1.5 KiB
Diff
45 lines
1.5 KiB
Diff
Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
===================================================================
|
|
--- docker-1.11.0.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
+++ docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
@@ -24,7 +24,7 @@ type ifreqIndex struct {
|
|
|
|
type ifreqHwaddr struct {
|
|
IfrnName [ifNameSize]byte
|
|
- IfruHwaddr syscall.RawSockaddr
|
|
+ IfruHwaddr patchedRawSockAddr
|
|
}
|
|
|
|
var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
|
|
Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go
|
|
@@ -0,0 +1,11 @@
|
|
+// Copyright (c) 2015 SUSE LLC. All rights reserved.
|
|
+
|
|
+// +build linux
|
|
+// +build ppc64 ppc64le
|
|
+
|
|
+package bridge
|
|
+
|
|
+type patchedRawSockAddr struct {
|
|
+ Family uint16
|
|
+ Data [14]int8
|
|
+}
|
|
Index: docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ docker-1.11.0/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go
|
|
@@ -0,0 +1,10 @@
|
|
+// Copyright (c) 2015 SUSE LLC. All rights reserved.
|
|
+
|
|
+// +build linux,!ppc64,!ppc64le
|
|
+
|
|
+package bridge
|
|
+
|
|
+type patchedRawSockAddr struct {
|
|
+ Family uint16
|
|
+ Data [14]int8
|
|
+}
|