From 9573f704c2dd2fd9c683054fdf4710f0bb36837b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ertu=C4=9Frul=20Erata?= Date: Sat, 7 May 2016 10:34:35 +0300 Subject: [PATCH] some fix for build docker --- hardware/virtualization/docker/actions.py | 1 + programming/language/go/actions.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/hardware/virtualization/docker/actions.py b/hardware/virtualization/docker/actions.py index 597fd36e87..0e26583472 100644 --- a/hardware/virtualization/docker/actions.py +++ b/hardware/virtualization/docker/actions.py @@ -11,6 +11,7 @@ from pisi.actionsapi import get shelltools.export("AUTO_GOPATH", "1") shelltools.export("DOCKER_GITCOMMIT", "20f81dd") +shelltools.export("GOROOT","/usr/lib/go") shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("CGO_CFLAGS", "-I/usr/include") diff --git a/programming/language/go/actions.py b/programming/language/go/actions.py index 6883bb1065..7916ede433 100644 --- a/programming/language/go/actions.py +++ b/programming/language/go/actions.py @@ -9,14 +9,17 @@ from pisi.actionsapi import autotools from pisi.actionsapi import shelltools from pisi.actionsapi import get -NoStrip = ["/"] +NoStrip = ["/usr/lib/go/pkg", "/usr/lib/go/src/runtime/race", "/usr/lib/go/src/debug/elf", "/usr/lib/go/src/debug/dwarf"] def build(): - + shelltools.export("go_platform","linux-amd64") + shelltools.export("go_linker","/lib/ld-linux-x86-64.so.2") + shelltools.export("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #0 + shelltools.export("GOBIN", "$GOROOT/bin") #1 shelltools.export("GOPATH", "%s" % get.workDIR()) - + shelltools.export("GOROOT_FINAL", "/usr/lib/go") shelltools.export("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR()) #2 shelltools.export("GOOS","linux")