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

Merge pull request #1720 from ertugerata/master

Browse Source 
fix build docker
This commit is contained in:
Ertuğrul Erata
2016-05-07 10:36:56 +03:00
parent 82c9b87e8e 9573f704c2
commit 83bf22951c
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hardware/virtualization/docker/actions.py
+1
View File
@@ -11,6 +11,7 @@ from pisi.actionsapi import get
shelltools.export("AUTO_GOPATH", "1") shelltools.export("AUTO_GOPATH", "1")
shelltools.export("DOCKER_GITCOMMIT", "20f81dd") shelltools.export("DOCKER_GITCOMMIT", "20f81dd")
shelltools.export("GOROOT","/usr/lib/go")
shelltools.export("GOPATH", "%s" % get.workDIR()) shelltools.export("GOPATH", "%s" % get.workDIR())
shelltools.export("CGO_CFLAGS", "-I/usr/include") shelltools.export("CGO_CFLAGS", "-I/usr/include")
need_build
+4
View File
@@ -6,3 +6,7 @@
hardware/optical/simpleburn hardware/optical/simpleburn
kernel/drivers/module-fglrx kernel/drivers/module-fglrx
* Packages that needs compiling
desktop/toolkit/qt5/qt5-webkit (2 > 1)
programming/language/python/python3-setuptools (2 > 1)
programming/language/go/actions.py
+6 -3
View File
@@ -9,14 +9,17 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
from pisi.actionsapi import get 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(): 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("GOROOT", "%s/go-go1.6.2" % get.workDIR()) #0
shelltools.export("GOBIN", "$GOROOT/bin") #1 shelltools.export("GOBIN", "$GOROOT/bin") #1
shelltools.export("GOPATH", "%s" % get.workDIR()) 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("GOROOT_BOOTSTRAP", "%s/go-go1.6.2/go-linux-amd64-bootstrap" % get.workDIR()) #2
shelltools.export("GOOS","linux") shelltools.export("GOOS","linux")