Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docker verbump, tier3 kbookmarks fix build

Browse Source
This commit is contained in:
Ertuğrul Erata
2015-07-25 12:23:30 +03:00
parent a5bc7275a9
commit 31da617443
4 changed files with 43 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/docker/actions.py
+7 -7
View File
@@ -10,13 +10,13 @@ from pisi.actionsapi import shelltools
from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "0baf609") #DOCKER_GITCOMMIT="0baf609"
shelltools.export("DOCKER_GITCOMMIT", "786b29d")
shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("CGO_CFLAGS", "-I/usr/include")
shelltools.export("CGO_LDFLAGS", "-L/usr/lib")
shelltools.export("DOCKER_BUILDTAGS","exclude_graphdriver_aufs")
shelltools.export("DOCKER_INITPATH", "/usr/libexec/docker/dockerinit")
shelltools.export("DOCKER_INITPATH", "/usr/lib/docker/dockerinit")
NoStrip=["/"]
@@ -24,14 +24,14 @@ def build():
shelltools.system("./hack/make.sh dynbinary")
def install():
pisitools.dobin("bundles/1.7.0/dynbinary/docker")
pisitools.dobin("bundles/1.7.0/dynbinary/docker-1.7.0")
pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit", "/usr/libexec/docker")
pisitools.doexe("bundles/1.7.0/dynbinary/dockerinit-1.7.0", "/usr/libexec/docker")
pisitools.dobin("bundles/1.7.1/dynbinary/docker")
pisitools.dobin("bundles/1.7.1/dynbinary/docker-1.7.1")
pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit", "/usr/lib/docker")
pisitools.doexe("bundles/1.7.1/dynbinary/dockerinit-1.7.1", "/usr/lib/docker")
# insert udev rules
pisitools.insinto("/etc/udev/rules.d", "contrib/udev/*.rules")
#insert contrib in docs
pisitools.insinto("/usr/share/doc/docker", "contrib")