fc77975fbd
a850225433
Which "fixes" the data type for RawSockaddr.Data
However, docker now expects the "wrong" data type, since docker had a workaround
for that issue.
Thus, we need to workaround the workaroundn in tumbleweed
- There was an error in one of the file list
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=54
47 lines
1.6 KiB
Diff
47 lines
1.6 KiB
Diff
diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
index 007ccb2..65f638f 100644
|
|
--- a/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
+++ b/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux.go
|
|
@@ -22,7 +22,7 @@ type ifreqIndex struct {
|
|
|
|
type ifreqHwaddr struct {
|
|
IfrnName [ifNameSize]byte
|
|
- IfruHwaddr syscall.RawSockaddr
|
|
+ IfruHwaddr patchedRawSockAddr
|
|
}
|
|
|
|
var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
|
|
diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_ppc64xe_type.go
|
|
new file mode 100644
|
|
index 0000000..118f7bf
|
|
--- /dev/null
|
|
+++ b/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
|
|
+}
|
|
diff --git a/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go b/vendor/src/github.com/docker/libnetwork/drivers/bridge/patched_socket_type.go
|
|
new file mode 100644
|
|
index 0000000..cdba329
|
|
--- /dev/null
|
|
+++ b/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
|
|
+}
|