restore fix-docker-init.patch since docker-init has been removed
in master branch, but not in this 1.10.0 version OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=60
This commit is contained in:
parent
248b1f0d92
commit
19f2b26c4c
@ -43,6 +43,7 @@ Source8: docker-audit.rules
|
||||
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
|
||||
BuildRequires: audit
|
||||
@ -148,6 +149,7 @@ Test package for docker. It contains the source code and the tests.
|
||||
%if 0%{?suse_version} >= 1330 && 0%{?is_opensuse} == 1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p1
|
||||
%ifnarch %go_arches
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
|
10
fix-docker-init.patch
Normal file
10
fix-docker-init.patch
Normal file
@ -0,0 +1,10 @@
|
||||
diff -Naur a/hack/make/.dockerinit b/hack/make/.dockerinit
|
||||
--- a/hack/make/.dockerinit 2015-08-11 18:35:27.000000000 +0200
|
||||
+++ b/hack/make/.dockerinit 2015-08-12 18:14:25.743452565 +0200
|
||||
@@ -29,5 +29,6 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+/usr/bin/strip -s $DEST/dockerinit-$VERSION
|
||||
# sha1 our new dockerinit to ensure separate docker and dockerinit always run in a perfect pair compiled for one another
|
||||
export DOCKER_INITSHA1=$($sha1sum "$DEST/dockerinit-$VERSION" | cut -d' ' -f1)
|
1182
remove_docker_init.patch
Normal file
1182
remove_docker_init.patch
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user