pool/docker
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

review patch numbers and comments and spaces in files

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=69
This commit is contained in:
Jordi Massaguer 2016-02-09 17:35:20 +00:00 committed by Git OBS Bridge
parent 92e1eff954
commit c6dc735d90
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker.spec
View File

@ -44,10 +44,15 @@ Source100: sysconfig.docker.ppc64le
Patch0: fix_platform_type_arm.patch
Patch1: gcc5_socket_workaround.patch
Patch2: fix-docker-init.patch
Patch100: gcc-go-patches.patch
Patch101: fix-ppc64le.patch
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
# We cannot do that, right now a quick and really dirty way to get it running is
# to simply disable this check
Patch100: ignore-dockerinit-checksum.patch
Patch101: gcc-go-patches.patch
Patch102: netlink_gcc_go.patch
Patch103: ignore-dockerinit-checksum.patch
#TODO: rename this patch later on
Patch108: ignore-dockerinit-checksum.patch
BuildRequires: audit
BuildRequires: bash-completion
BuildRequires: device-mapper-devel >= 1.2.68
@ -153,14 +158,10 @@ Test package for docker. It contains the source code and the tests.
%endif
%patch2 -p1
%ifnarch %go_arches
%patch100 -p1
%patch101 -p1
%patch108 -p1
%patch102 -p1
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
# Right now docker passes the sha1sum of the dockerinit binary to the docker binary at build time
# We cannot do that, right now a quick and really dirty way to get it running is
# to simply disable this check
%patch103 -p1
%patch100 -p1
%endif
cp %{SOURCE7} .

8
fix-ppc64le.patch
View File

@ -1,4 +1,3 @@
Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
===================================================================
--- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
@ -6,9 +5,9 @@ Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netli
@@ -1,4 +1,4 @@
-// +build arm ppc64 ppc64le
+// +build arm ppc64,!ppc64le
package bridge
Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
===================================================================
--- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_notarm.go
@ -16,5 +15,6 @@ Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netli
@@ -1,4 +1,4 @@
-// +build !arm,!ppc64,!ppc64le
+// +build !arm,!ppc64 ppc64le
package bridge