From b04706b8750ca3302f68183934fa29d5db34c9dc Mon Sep 17 00:00:00 2001 From: Eugene Dementiev Date: Tue, 8 Sep 2015 01:01:22 +0300 Subject: [PATCH 1/2] Fix makefile warning for go1.5 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a907f468d369f..751cde8bb4bb9 100644 --- a/Makefile +++ b/Makefile @@ -6,18 +6,18 @@ endif build: prepare $(GOBIN)/godep go build -o telegraf -ldflags \ - "-X main.Version $(VERSION)" \ + "-X main.Version=$(VERSION)" \ ./cmd/telegraf/telegraf.go build-linux-bins: prepare GOARCH=amd64 GOOS=linux $(GOBIN)/godep go build -o telegraf_linux_amd64 \ - -ldflags "-X main.Version $(VERSION)" \ + -ldflags "-X main.Version=$(VERSION)" \ ./cmd/telegraf/telegraf.go GOARCH=386 GOOS=linux $(GOBIN)/godep go build -o telegraf_linux_386 \ - -ldflags "-X main.Version $(VERSION)" \ + -ldflags "-X main.Version=$(VERSION)" \ ./cmd/telegraf/telegraf.go GOARCH=arm GOOS=linux $(GOBIN)/godep go build -o telegraf_linux_arm \ - -ldflags "-X main.Version $(VERSION)" \ + -ldflags "-X main.Version=$(VERSION)" \ ./cmd/telegraf/telegraf.go prepare: From 9e23f8490315f3f45193dbdc1ab2deed026a45c0 Mon Sep 17 00:00:00 2001 From: Eugene Dementiev Date: Fri, 18 Sep 2015 01:11:46 +0300 Subject: [PATCH 2/2] Add shebang to postinstall script (fixes installation on Debian family) --- scripts/package.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/package.sh b/scripts/package.sh index 6ca5b0dca00b2..24f30f5bb38e0 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -155,6 +155,7 @@ do_build() { generate_postinstall_script() { version=$1 cat <$POST_INSTALL_PATH +#!/bin/sh rm -f $INSTALL_ROOT_DIR/telegraf rm -f $INSTALL_ROOT_DIR/init.sh ln -sfn $INSTALL_ROOT_DIR/versions/$version/telegraf $INSTALL_ROOT_DIR/telegraf