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
Paul Emm. Katsoulakis committed
Aug 12, 2019 at 09:55 UTC
af41a01c1b80ea881c80a30ca89b9d448b42865d
6 files changed
+8
-7
Makefile.am
+1
@@ -60,6 +60,7 @@ dist_noinst_DATA= \
60
package.json \
61
docs \
62
packaging/version \
63
+ packaging/go.d.version \
64
packaging/go.d.checksums \
65
packaging/installer/README.md \
66
packaging/installer/UNINSTALL.md \
contrib/debian/install_go.sh
+3
-4
@@ -1,7 +1,8 @@
1
#!/usr/bin/env bash
2
3
-LIB_DIR="$1"
4
-LIBEXEC_DIR="$2"
3
+GO_PACKAGE_VERSION="$1"
4
+LIB_DIR="$2"
5
+LIBEXEC_DIR="$3"
6
7
# ############################################################
8
# Package Go within netdata (TBD: Package it separately)
@@ -35,8 +36,6 @@ download_go() {
36
}
37
38
install_go() {
38
- # When updating this value, ensure correct checksums in packaging/go.d.checksums
39
- GO_PACKAGE_VERSION="v0.8.0"
39
ARCH_MAP=(
40
'i386::386'
41
'i686::386'
contrib/debian/rules
+1
-1
@@ -55,7 +55,7 @@ override_dh_install: debian/netdata.postinst
55
56
# Install go
57
#
58
- debian/install_go.sh $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata
58
+ debian/install_go.sh $$(cat ${CURDIR}/packaging/go.d.version) $(TOP)/usr/lib/$(DEB_HOST_MULTIARCH)/netdata/ $(TOP)/usr/libexec/netdata
59
60
override_dh_installdocs:
61
dh_installdocs
netdata-installer.sh
+1
-1
@@ -774,7 +774,7 @@ fi
774
775
install_go() {
776
# When updating this value, ensure correct checksums in packaging/go.d.checksums
777
- GO_PACKAGE_VERSION="v0.8.0"
777
+ GO_PACKAGE_VERSION="$(cat packaging/go.d.version)"
778
ARCH_MAP=(
779
'i386::386'
780
'i686::386'
netdata.spec.in
+1
-1
@@ -322,7 +322,7 @@ download_go() {
322
323
install_go() {
324
# When updating this value, ensure correct checksums in packaging/go.d.checksums
325
- GO_PACKAGE_VERSION="v0.8.0"
325
+ GO_PACKAGE_VERSION="$(cat packaging/go.d.version)"
326
ARCH_MAP=(
327
'i386::386'
328
'i686::386'
packaging/go.d.version
new
+1
@@ -0,0 +1 @@
1
+v0.8.0