diff options
| author | Paul Emm. Katsoulakis <34388743+paulkatsoulakis@users.noreply.github.com> | 2019-08-12 09:55:32 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-12 09:55:32 +0300 |
| commit | af41a01c1b80ea881c80a30ca89b9d448b42865d (patch) | |
| tree | 6f0e5fc51011fcea54e72279ee0bf186dcc6c584 /contrib | |
| parent | 423cf22d5647da1d6d326062eed61e4586431f1b (diff) | |
netdata/packaging: put go.d version in one place (#6557)
* netdata/packaging: [ci skip] Add go.d version to a single place
* netdata/packaging: [ci skip] Things are a bit different in debian build, we need to define the path in a different way so pass it from the upper layer
* netdata/packaging: [ci skip] Missed to add on the makefile
* netdata/packaging: bump go.d version
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/debian/install_go.sh | 7 | ||||
| -rwxr-xr-x | contrib/debian/rules | 2 |
2 files changed, 4 insertions, 5 deletions
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 |