1
0
Fork 0

bulk update version up

This commit is contained in:
Sangbum Kim 2016-06-26 03:30:57 +09:00
parent 63c9cbff58
commit b1bbd96d97
2 changed files with 42 additions and 7 deletions

View File

@ -10,3 +10,38 @@
GOURL ?= https://golang.org/dl GOURL ?= https://golang.org/dl
GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz GOPKG ?= go$(GO_VERSION).$(GOOS)-$(GOARCH).tar.gz
GOPATH := $(CURDIR)/.build/gopath GOPATH := $(CURDIR)/.build/gopath
--- a/Makefile.COMMON 2016-05-07 01:00:04.729197514 +0900
+++ b/Makefile.COMMON 2016-05-07 01:02:10.387244408 +0900
@@ -51,16 +51,9 @@
# Check for the correct version of go in the path. If we find it, use it.
# Otherwise, prepare to build go locally.
-ifeq ($(shell command -v "go" >/dev/null && go version | sed -e 's/^[^0-9.]*\([0-9.]*\).*/\1/'), $(GO_VERSION))
- GOCC ?= $(shell command -v "go")
- GOFMT ?= $(shell command -v "gofmt")
- GO ?= GOPATH=$(GOPATH) $(GOCC)
-else
- GOROOT ?= $(CURDIR)/.build/go$(GO_VERSION)
- GOCC ?= $(GOROOT)/bin/go
- GOFMT ?= $(GOROOT)/bin/gofmt
- GO ?= GOROOT=$(GOROOT) GOPATH=$(GOPATH) $(GOCC)
-endif
+GOCC ?= $(shell command -v "go")
+GOFMT ?= $(shell command -v "gofmt")
+GO ?= GOPATH=$(GOPATH) $(GOCC)
# Never honor GOBIN, should it be set at all.
unexport GOBIN
--- a/Makefile.COMMON 2016-05-07 01:00:04.729197514 +0900
+++ b/Makefile.COMMON 2016-05-07 01:00:19.126786174 +0900
@@ -79,8 +79,8 @@
@echo Abort now if you want to manually install it system-wide instead.
@echo
@sleep 5
- mkdir -p $(GOROOT)
- curl -L $(GOURL)/$(GOPKG) | tar -C $(GOROOT) --strip 1 -xz
+ #mkdir -p $(GOROOT)
+ #curl -L $(GOURL)/$(GOPKG) | tar -C $(GOROOT) --strip 1 -xz
$(SELFLINK):
mkdir -p $(dir $@)

View File

@ -2,21 +2,20 @@
# Contributor: Aaron Schaefer <aaron@elasticdog.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com>
pkgname=consul-exporter pkgname=consul-exporter
pkgver=0.2.0.r18.g673081d pkgver=0.2.0.r27.ga16dc59
pkgrel=1 pkgrel=1
pkgdesc="Export Consul service health to Prometheus." pkgdesc="Export Consul service health to Prometheus."
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="https://github.com/prometheus/consul_exporter" url="https://github.com/prometheus/consul_exporter"
license=('custom') license=('custom')
depends=('glibc' 'sh' 'go') makedepends=('go')
depends=('glibc' 'sh')
source=( source=(
"$pkgname::git+https://github.com/prometheus/consul_exporter.git" "$pkgname::git+https://github.com/prometheus/consul_exporter.git"
"01-golang1_6.patch"
"consul-exporter.service" "consul-exporter.service"
"consul-exporter.install") "consul-exporter.install")
install=consul-exporter.install install=consul-exporter.install
sha512sums=('SKIP' sha512sums=('SKIP'
'44c3236cc5925c89dce5af1e8620fceee8f2f0c3bcaccb3530865d25b9a67d9d2898d07f9782a6da9344e867a5f537285e8697aacfa05c19f96e705f167aeb4a'
'a0fd5d5915b3e10d303d555d5599f879117f0203749fca1769cf355bb78cb0497fc943ff44fa7ff0ae61f23c7c97ba4866d905afaf8e771f3dc1290f298c38d6' 'a0fd5d5915b3e10d303d555d5599f879117f0203749fca1769cf355bb78cb0497fc943ff44fa7ff0ae61f23c7c97ba4866d905afaf8e771f3dc1290f298c38d6'
'c55320053e34b10b2d94627cec62242e58fcee72c8cc7eb6efa083b1bc26bedf4ce79efe3fa49bf9e1648c3a1a7b8e9d7bcfce08aa002dc7bfd6c719ad73b5b0') 'c55320053e34b10b2d94627cec62242e58fcee72c8cc7eb6efa083b1bc26bedf4ce79efe3fa49bf9e1648c3a1a7b8e9d7bcfce08aa002dc7bfd6c719ad73b5b0')
@ -28,19 +27,20 @@ pkgver() {
} }
prepare(){ prepare(){
cd "$srcdir/$pkgname" cd "$srcdir/$pkgname"
patch -p1 -i "$srcdir/01-golang1_6.patch"
mkdir -p "${srcdir}/gopath" mkdir -p "${srcdir}/gopath"
mkdir -p "$GOPATH/src/github.com/prometheus"
ln -sr "$srcdir/$pkgname" "$GOPATH/src/github.com/prometheus/consul_exporter"
export GOPATH="${srcdir}/gopath" export GOPATH="${srcdir}/gopath"
} }
build() { build() {
cd ${srcdir}/${pkgname} cd ${srcdir}/${pkgname}
make make build
} }
package() { package() {
cd ${srcdir}/${pkgname} cd ${srcdir}/${pkgname}
install -D -m755 consul_exporter ${pkgdir}/usr/bin/${pkgname} install -D -m755 consul-exporter ${pkgdir}/usr/bin/${pkgname}
mkdir -p "${pkgdir}/usr/lib/systemd/system/" mkdir -p "${pkgdir}/usr/lib/systemd/system/"
install -pm 644 "${srcdir}/consul-exporter.service" "${pkgdir}/usr/lib/systemd/system/consul-exporter.service" install -pm 644 "${srcdir}/consul-exporter.service" "${pkgdir}/usr/lib/systemd/system/consul-exporter.service"