fix: rename arm rpms with yum-compatible names (#21750)

pull/21777/head
Cody Shepherd 2021-06-28 07:45:58 -07:00 committed by GitHub
parent 4268cf3432
commit e7edf9fc5f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 0 deletions

View File

@ -11,6 +11,7 @@
- [#21666](https://github.com/influxdata/influxdb/pull/21666): fix: do not panic on cleaning up failed iterators
- [#21693](https://github.com/influxdata/influxdb/pull/21693): fix: don't access a field in a nil struct
- [#21558](https://github.com/influxdata/influxdb/pull/21558): fix: do not send non-UTF-8 characters to subscriptions
- [#21750](https://github.com/influxdata/influxdb/pull/21750): fix: rename arm rpms with yum-compatible names
v1.9.2 [unreleased]
- [#21631](https://github.com/influxdata/influxdb/pull/21631): fix: group by returns multiple results per group in some circumstances

View File

@ -707,6 +707,11 @@ def package(build_output, pkg_name, version, nightly=False, iteration=1, static=
elif package_type not in ['zip', 'tar'] and static or "static_" in arch:
logging.info("Skipping package type '{}' for static builds.".format(package_type))
else:
if package_type == "rpm":
if package_arch == "armhf":
package_arch = "armv7hl"
elif package_arch == "arm64":
package_arch = "aarch64"
fpm_command = "fpm {} --name {} -a {} -t {} --version {} --iteration {} -C {} -p {} ".format(
fpm_common_args,
name,