review patch numbers and comments and spaces in files
OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=69
This commit is contained in:
parent
92e1eff954
commit
c6dc735d90
19
docker.spec
19
docker.spec
@ -44,10 +44,15 @@ Source100: sysconfig.docker.ppc64le
|
|||||||
Patch0: fix_platform_type_arm.patch
|
Patch0: fix_platform_type_arm.patch
|
||||||
Patch1: gcc5_socket_workaround.patch
|
Patch1: gcc5_socket_workaround.patch
|
||||||
Patch2: fix-docker-init.patch
|
Patch2: fix-docker-init.patch
|
||||||
Patch100: gcc-go-patches.patch
|
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
|
||||||
Patch101: fix-ppc64le.patch
|
# 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
|
Patch102: netlink_gcc_go.patch
|
||||||
Patch103: ignore-dockerinit-checksum.patch
|
#TODO: rename this patch later on
|
||||||
|
Patch108: ignore-dockerinit-checksum.patch
|
||||||
BuildRequires: audit
|
BuildRequires: audit
|
||||||
BuildRequires: bash-completion
|
BuildRequires: bash-completion
|
||||||
BuildRequires: device-mapper-devel >= 1.2.68
|
BuildRequires: device-mapper-devel >= 1.2.68
|
||||||
@ -153,14 +158,10 @@ Test package for docker. It contains the source code and the tests.
|
|||||||
%endif
|
%endif
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%ifnarch %go_arches
|
%ifnarch %go_arches
|
||||||
%patch100 -p1
|
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
|
%patch108 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
# Required to overcome some limitations of gcc-go: https://groups.google.com/forum/#!msg/golang-nuts/SlGCPYkjxo4/4DjcjXRCqAkJ
|
%patch100 -p1
|
||||||
# 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
|
|
||||||
%endif
|
%endif
|
||||||
cp %{SOURCE7} .
|
cp %{SOURCE7} .
|
||||||
|
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
|
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
|
--- docker-1.9.1.orig/vendor/src/github.com/docker/libnetwork/drivers/bridge/netlink_deprecated_linux_armppc64.go
|
||||||
@ -18,3 +17,4 @@ Index: docker-1.9.1/vendor/src/github.com/docker/libnetwork/drivers/bridge/netli
|
|||||||
+// +build !arm,!ppc64 ppc64le
|
+// +build !arm,!ppc64 ppc64le
|
||||||
|
|
||||||
package bridge
|
package bridge
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user