From fc4cb1654cc443b7e960463a0d34ba8eea405b81 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Wed, 24 Feb 2016 09:10:47 -0700 Subject: [PATCH 1/2] Fix deb and rpm packages closes #752 closes #750 --- scripts/build.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/build.py b/scripts/build.py index 1465e36f33edd..df8fbb979ecc6 100755 --- a/scripts/build.py +++ b/scripts/build.py @@ -411,8 +411,10 @@ def build_packages(build_output, version, pkg_arch, nightly=False, rc=None, iter for b in targets: if p == 'windows': b = b + '.exe' + to = os.path.join(build_root, b) + else: + to = os.path.join(build_root, INSTALL_ROOT_DIR[1:], b) fr = os.path.join(current_location, b) - to = os.path.join(build_root, b) print("\t- [{}][{}] - Moving from '{}' to '{}'".format(p, a, fr, to)) copy_file(fr, to) # Package the directory structure From 664816383ad2601f3a8511b991634fa45cd4dc60 Mon Sep 17 00:00:00 2001 From: Cameron Sparr Date: Wed, 24 Feb 2016 10:05:10 -0700 Subject: [PATCH 2/2] Update readme to 0.10.4.1 --- CHANGELOG.md | 9 +++++++++ README.md | 22 +++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc83441b2b395..b8ae58e743513 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,15 @@ ### Bugfixes +## v0.10.4.1 + +### Release Notes +- Bug in the build script broke deb and rpm packages. + +### Bugfixes +- [#750](https://github.com/influxdata/telegraf/issues/750): deb package broken +- [#752](https://github.com/influxdata/telegraf/issues/752): rpm package broken + ## v0.10.4 [2016-02-24] ### Release Notes diff --git a/README.md b/README.md index 0f3f81ebfbf13..b4e66173528c2 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,12 @@ the [release blog post](https://influxdata.com/blog/announcing-telegraf-0-10-0/) ### Linux deb and rpm Packages: Latest: -* http://get.influxdb.org/telegraf/telegraf_0.10.4-1_amd64.deb -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1.x86_64.rpm +* http://get.influxdb.org/telegraf/telegraf_0.10.4.1-1_amd64.deb +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1.x86_64.rpm Latest (arm): -* http://get.influxdb.org/telegraf/telegraf_0.10.4-1_arm.deb -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1.arm.rpm +* http://get.influxdb.org/telegraf/telegraf_0.10.4.1-1_arm.deb +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1.arm.rpm 0.2.x: * http://get.influxdb.org/telegraf/telegraf_0.2.4_amd64.deb @@ -56,9 +56,9 @@ for instructions, replacing the `influxdb` package name with `telegraf`. ### Linux tarballs: Latest: -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1_linux_amd64.tar.gz -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1_linux_i386.tar.gz -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1_linux_arm.tar.gz +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1_linux_amd64.tar.gz +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1_linux_i386.tar.gz +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1_linux_arm.tar.gz 0.2.x: * http://get.influxdb.org/telegraf/telegraf_linux_amd64_0.2.4.tar.gz @@ -70,13 +70,13 @@ Latest: To install the full directory structure with config file, run: ``` -sudo tar -C / -zxvf ./telegraf-0.10.4-1_linux_amd64.tar.gz +sudo tar -C / -zxvf ./telegraf-0.10.4.1-1_linux_amd64.tar.gz ``` To extract only the binary, run: ``` -tar -zxvf telegraf-0.10.4-1_linux_amd64.tar.gz --strip-components=3 ./usr/bin/telegraf +tar -zxvf telegraf-0.10.4.1-1_linux_amd64.tar.gz --strip-components=3 ./usr/bin/telegraf ``` ### Ansible Role: @@ -93,8 +93,8 @@ brew install telegraf ### Windows Binaries (EXPERIMENTAL) Latest: -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1_windows_amd64.zip -* http://get.influxdb.org/telegraf/telegraf-0.10.4-1_windows_i386.zip +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1_windows_amd64.zip +* http://get.influxdb.org/telegraf/telegraf-0.10.4.1-1_windows_i386.zip ### From Source: