rpm/docker
SHA256
1
0
Fork 0
forked from pool/docker
Code Pull Requests Activity

- Remove gcc5_socker_workaround.patch: This patch is not needed anymore

Browse Source 
since gcc5 has been updated in all platforms

OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=99
This commit is contained in:
Jordi Massaguer 2016-04-18 15:45:05 +00:00 committed by Git OBS Bridge
parent d627c46579
commit 585f0efd39
3 changed files with 6 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Apr 18 15:44:11 UTC 2016 - jmassaguerpla@suse.com
- Remove gcc5_socker_workaround.patch: This patch is not needed anymore
since gcc5 has been updated in all platforms
-------------------------------------------------------------------
Mon Apr 18 06:19:18 UTC 2016 - asarai@suse.de

2
docker.spec
View File

@ -47,7 +47,6 @@ Source7: README_SUSE.md
Source8: docker-audit.rules
# TODO: remove once we figure out what is wrong with iptables on ppc64le
Source100: sysconfig.docker.ppc64le
Patch1: gcc5_socket_workaround.patch
%if 0%{?is_opensuse}
# nothing
%else
@ -160,7 +159,6 @@ Test package for docker. It contains the source code and the tests.
%if 0%{?is_opensuse}
# nothing
%else
%patch1 -p1
%patch200 -p1
%endif
%ifnarch %go_arches

44
gcc5_socket_workaround.patch
View File

@ -1,44 +0,0 @@
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
+}