Commit 5f188058 by Leonard Gram

build: builds for armv6.

parent e43fafd9
...@@ -165,6 +165,7 @@ func makeLatestDistCopies() { ...@@ -165,6 +165,7 @@ func makeLatestDistCopies() {
".x86_64.rpm": "dist/grafana-latest-1.x86_64.rpm", ".x86_64.rpm": "dist/grafana-latest-1.x86_64.rpm",
".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz", ".linux-amd64.tar.gz": "dist/grafana-latest.linux-x64.tar.gz",
".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz", ".linux-armv7.tar.gz": "dist/grafana-latest.linux-armv7.tar.gz",
".linux-armv6.tar.gz": "dist/grafana-latest.linux-armv6.tar.gz",
".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz", ".linux-arm64.tar.gz": "dist/grafana-latest.linux-arm64.tar.gz",
} }
...@@ -239,6 +240,8 @@ func createDebPackages() { ...@@ -239,6 +240,8 @@ func createDebPackages() {
previousPkgArch := pkgArch previousPkgArch := pkgArch
if pkgArch == "armv7" { if pkgArch == "armv7" {
pkgArch = "armhf" pkgArch = "armhf"
} else if pkgArch == "armv6" {
pkgArch = "armel"
} }
createPackage(linuxPackageOptions{ createPackage(linuxPackageOptions{
packageType: "deb", packageType: "deb",
......
...@@ -32,10 +32,12 @@ echo "Build arguments: $OPT" ...@@ -32,10 +32,12 @@ echo "Build arguments: $OPT"
# build only amd64 for enterprise # build only amd64 for enterprise
if echo "$EXTRA_OPTS" | grep -vq enterprise ; then if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build go run build.go -goos darwin -cc ${CCOSX64} ${OPT} build
fi fi
go run build.go -goos windows -cc ${CCWIN64} ${OPT} build go run build.go -goos windows -cc ${CCWIN64} ${OPT} build
# Do not remove CC from the linux build, its there for compatibility with Centos6 # Do not remove CC from the linux build, its there for compatibility with Centos6
...@@ -67,6 +69,7 @@ rm tools/phantomjs/phantomjs ...@@ -67,6 +69,7 @@ rm tools/phantomjs/phantomjs
# build only amd64 for enterprise # build only amd64 for enterprise
if echo "$EXTRA_OPTS" | grep -vq enterprise ; then if echo "$EXTRA_OPTS" | grep -vq enterprise ; then
go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
......
...@@ -28,6 +28,7 @@ fi ...@@ -28,6 +28,7 @@ fi
echo "Build arguments: $OPT" echo "Build arguments: $OPT"
go run build.go -goarch armv6 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build go run build.go -goarch armv7 -cc ${CCARMV7} ${OPT} build
go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build go run build.go -goarch arm64 -cc ${CCARM64} ${OPT} build
...@@ -49,6 +50,7 @@ source /etc/profile.d/rvm.sh ...@@ -49,6 +50,7 @@ source /etc/profile.d/rvm.sh
echo "Packaging" echo "Packaging"
go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only go run build.go -goos linux -pkg-arch amd64 ${OPT} package-only
go run build.go -goos linux -pkg-arch armv6 ${OPT} package-only
go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only go run build.go -goos linux -pkg-arch armv7 ${OPT} package-only
go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only go run build.go -goos linux -pkg-arch arm64 ${OPT} package-only
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment