Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: convert arm arch names for rpms during builds via docker #21775

Merged
merged 2 commits into from
Jul 2, 2021
Merged

fix: convert arm arch names for rpms during builds via docker #21775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e851ae
fix: convert arm arch names for rpms during builds via docker
codyshepherd Jul 1, 2021
cbfb88e
chore: update changelog
codyshepherd Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
v1.8.7 [unreleased]
-------------------

- [#](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
- [#21749](https://github.com/influxdata/influxdb/pull/21749): fix: rename arm rpms with yum-compatible names
- [#21775](https://github.com/influxdata/influxdb/pull/21775): fix: convert arm arch names for rpms during builds via docker

v1.8.6 [2021-05-20]
-------------------
Expand Down
9 changes: 8 additions & 1 deletion releng/packages/fs/usr/local/bin/influxdb_packages.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,13 @@ elif [ "$OS" == "linux" ] || [ "$OS" == "darwin" ]; then
if [ "$OS" == "linux" ] ; then
# Call fpm to build .deb and .rpm packages.
for typeargs in "-t deb" "-t rpm --depends coreutils --depends shadow-utils"; do
ARCH_CONVERTED=$ARCH
pkg_t=$(echo $typeargs | cut -d ' ' -f2)
if [ "$pkg_t" == "rpm" ] && [ $"$ARCH" == "armhf" ]; then
ARCH_CONVERTED="armv7hl"
elif [ "$pkg_t" == "rpm" ] && [ $"$ARCH" == "arm64" ]; then
ARCH_CONVERTED="aarch64"
fi
FPM_NAME=$(
fpm \
-s dir \
Expand All @@ -133,7 +140,7 @@ elif [ "$OS" == "linux" ] || [ "$OS" == "darwin" ]; then
--config-files /etc/influxdb/influxdb.conf \
--config-files /etc/logrotate.d/influxdb \
--name "influxdb" \
--architecture "$ARCH" \
--architecture "$ARCH_CONVERTED" \
--version "$VERSION" \
--iteration 1 \
-C "$PKG_ROOT" \
Expand Down