Skip to content

Commit fbd1386

Browse files
committed
fix
1 parent 6967c6f commit fbd1386

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

ci/build/arch-override.json

-8
This file was deleted.

ci/build/build-lib.sh

+13-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,19 @@
77

88
# On some CPU architectures (notably node/uname "armv7l", default on Raspberry Pis),
99
# different package managers have different labels for the same CPU (deb=armhf, rpm=armhfp).
10-
# This function parses arch-override.json and returns the overriden arch on platforms
10+
# This function returns the overriden arch on platforms
1111
# with alternate labels, or the same arch otherwise.
1212
get_nfpm_arch() {
13-
if jq -re ".${PKG_FORMAT}.${ARCH}" ./ci/build/arch-override.json > /dev/null; then
14-
jq -re ".${PKG_FORMAT}.${ARCH}" ./ci/build/arch-override.json
15-
else
16-
echo "$ARCH"
17-
fi
13+
case "$ARCH" in
14+
armv7l)
15+
if [ "$PKG_FORMAT" = "deb" ]; then
16+
echo armhf
17+
elif [ "$PKG_FORMAT" = "rpm" ]; then
18+
echo armhfp
19+
fi
20+
;;
21+
*)
22+
echo "$ARCH"
23+
;;
24+
esac
1825
}

0 commit comments

Comments
 (0)