commit 98d3177ce0572141448422243831bebffb4c2a0e
Author: Aria Stewart <[email protected]>
Date: Thu Nov 28 12:48:33 2013 -0700
Patch out a check for the SHA1 sum of dockerinit
lxc-docker-nosha.patch | 27 +++++++++++++++++++++++++++
lxc-docker.spec | 2 ++
2 files changed, 29 insertions(+)
---
diff --git a/lxc-docker.spec b/lxc-docker.spec
index ca91b7e..0086ee2 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -31,6 +31,7 @@ Suggests: git-core >= 1.7
Suggests: libcgroup
Suggests: xz >= 1:4.9
Provides: group(docker)
+Patch0: lxc-docker-nosha.patch
# only runs on x64 hosts for now:
# https://github.com/dotcloud/docker/issues/136
# https://github.com/dotcloud/docker/issues/611
@@ -82,6 +83,7 @@ This plugin provides syntax highlighting in Dockerfile.
%prep
%setup -q -n docker-%{version}
+%patch0 -p1
install -d vendor/src/github.com/dotcloud
ln -s $(pwd) vendor/src/github.com/dotcloud/docker
diff --git a/lxc-docker-nosha.patch b/lxc-docker-nosha.patch
new file mode 100644
index 0000000..2ab4972
--- /dev/null
+++ b/lxc-docker-nosha.patch
@@ -0,0 +1,27 @@
+Only in docker-0.7.0/: build
+diff -ur docker-0.7.0-o/utils/utils.go docker-0.7.0/utils/utils.go
+--- docker-0.7.0-o/utils/utils.go 2013-11-26 01:09:45.000000000 -0700
++++ docker-0.7.0/utils/utils.go 2013-11-28 12:39:38.000000000 -0700
+@@ -272,10 +272,6 @@
+ // Figure out the path of our dockerinit (which may be SelfPath())
+ func DockerInitPath(localCopy string) string {
+ selfPath := SelfPath()
+- if isValidDockerInitPath(selfPath, selfPath) {
+- // if we're valid, don't bother checking anything else
+- return selfPath
+- }
+ var possibleInits = []string{
+ localCopy,
+ filepath.Join(filepath.Dir(selfPath), "dockerinit"),
+@@ -291,9 +287,7 @@
+ // LookPath already validated that this file
exists and is executable (following symlinks), so how could Abs fail?
+ panic(err)
+ }
+- if isValidDockerInitPath(path, selfPath) {
+- return path
+- }
++ return path
+ }
+ }
+ return ""
+Only in docker-0.7.0/utils: utils.go~
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc-docker.git/commitdiff/98d3177ce0572141448422243831bebffb4c2a0e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
