diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rwxr-xr-x | contrib/debian/install_go.sh | 7 | ||||
| -rwxr-xr-x | contrib/debian/rules | 2 | ||||
| -rwxr-xr-x | netdata-installer.sh | 2 | ||||
| -rw-r--r-- | netdata.spec.in | 2 | ||||
| -rw-r--r-- | packaging/go.d.version | 1 |
6 files changed, 8 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index de161c849d..0e88962c7e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,6 +60,7 @@ dist_noinst_DATA= \ package.json \ docs \ packaging/version \ + packaging/go.d.version \ packaging/go.d.checksums \ packaging/installer/README.md \ packaging/installer/UNINSTALL.md \ diff --git a/contrib/debian/install_go.sh b/contrib/debian/install_go.sh index 629f034a1e..22ff691f96 100755 --- a/contrib/debian/install_go.sh +++ b/contrib/debian/install_go.sh @@ -1,7 +1,8 @@ #!/usr/bin/env bash -LIB_DIR="$1" -LIBEXEC_DIR="$2" +GO_PACKAGE_VERSION="$1" +LIB_DIR="$2" +LIBEXEC_DIR="$3" # ############################################################ # Package Go within netdata (TBD: Package it separately) @@ -35,8 +36,6 @@ download_go() { } install_go() { - # When updating this value, ensure correct checksums in packaging/go.d.checksums - GO_PACKAGE_VERSION="v0.8.0" ARCH_MAP=( 'i386::386' 'i686::386' diff --git a/contrib/debian/rules b/contrib/debian/rules index 88a8ab36a6..fa0d71e8af 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -55,7 +55,7 @@ override_dh_install: debian/netdata.postinst # Install go # - debian/install_go.sh $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata + debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata override_dh_installdocs: dh_installdocs diff --git a/netdata-installer.sh b/netdata-installer.sh index 205d115462..812921e221 100755 --- a/netdata-installer.sh +++ b/netdata-installer.sh @@ -774,7 +774,7 @@ fi install_go() { # When updating this value, ensure correct checksums in packaging/go.d.checksums - GO_PACKAGE_VERSION="v0.8.0" + GO_PACKAGE_VERSION="$(cat packaging/go.d.version)" ARCH_MAP=( 'i386::386' 'i686::386' diff --git a/netdata.spec.in b/netdata.spec.in index ed139ccb5b..9b2b29a54d 100644 --- a/netdata.spec.in +++ b/netdata.spec.in @@ -322,7 +322,7 @@ download_go() { install_go() { # When updating this value, ensure correct checksums in packaging/go.d.checksums - GO_PACKAGE_VERSION="v0.8.0" + GO_PACKAGE_VERSION="$(cat packaging/go.d.version)" ARCH_MAP=( 'i386::386' 'i686::386' diff --git a/packaging/go.d.version b/packaging/go.d.version new file mode 100644 index 0000000000..b19b521185 --- /dev/null +++ b/packaging/go.d.version @@ -0,0 +1 @@ +v0.8.0 |