diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2021-09-06 09:10:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-06 09:10:05 -0400 |
| commit | 214cb3a41e86bc11c825b9ed8ff2513d4e69c72d (patch) | |
| tree | 0dafc60c9701d2681bfdb45160c8271d3ca33a85 /packaging/makeself/jobs | |
| parent | 86bec920ef41913a0670c6f1be526c79bdbb8bf1 (diff) | |
Embed build architecture in static build archive names. (#11463)
* Embed build architecture in static build archive names.
This is required for proper support for static installs in the new
kickstart script.
The associated changes will also simplify adding static builds for other
architectures in the future.
* Update CI to use new static build changes properly.
* Fix typos.
* Fix link created by static build process.
* Fix build environment setup.
Diffstat (limited to 'packaging/makeself/jobs')
| -rwxr-xr-x | packaging/makeself/jobs/99-makeself.install.sh | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/packaging/makeself/jobs/99-makeself.install.sh b/packaging/makeself/jobs/99-makeself.install.sh index de641027b2..dbac65c16c 100755 --- a/packaging/makeself/jobs/99-makeself.install.sh +++ b/packaging/makeself/jobs/99-makeself.install.sh @@ -90,12 +90,19 @@ run rm "${NETDATA_MAKESELF_PATH}/makeself.lsm.tmp" # ----------------------------------------------------------------------------- # copy it to the netdata build dir -FILE="netdata-${VERSION}.gz.run" +FILE="netdata-${BUILDARCH}-${VERSION}.gz.run" run mkdir -p artifacts run mv "${NETDATA_INSTALL_PATH}.gz.run" "artifacts/${FILE}" -[ -f netdata-latest.gz.run ] && rm netdata-latest.gz.run -run ln -s "artifacts/${FILE}" netdata-latest.gz.run +[ -f "netdata-${BUILDARCH}-latest.gz.run" ] && rm "netdata-${BUILDARCH}-latest.gz.run" +run ln -s "artifacts/${FILE}" "netdata-${BUILDARCH}-latest.gz.run" + +if [ "${BUILDARCH}" = "x86_64" ]; then + [ -f "netdata-latest.gz.run" ] && rm "netdata-latest.gz.run" + run ln -s "artifacts/${FILE}" "netdata-latest.gz.run" + [ -f "artifacts/netdata-${VERSION}.gz.run" ] && rm "netdata-${VERSION}.gz.run" + run ln -s "./${FILE}" "artifacts/netdata-${VERSION}.gz.run" +fi echo >&2 "Self-extracting installer moved to 'artifacts/${FILE}'" |