Skip to content

Commit ebf0662

Browse files
authored
Merge branch 'main' into support_proctime_window
2 parents 72d82f8 + 9d1a5fc commit ebf0662

2 files changed

Lines changed: 11 additions & 12 deletions

File tree

dev/build-helper-functions.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -280,14 +280,13 @@ function setup_linux {
280280
exit 1
281281
;;
282282
esac
283-
elif [[ "$LINUX_DISTRIBUTION" == "rhel" ]]; then
284-
case "$LINUX_VERSION_ID" in
285-
9.6)
286-
$GLUTEN_VELOX_SCRIPT_HOME/setup-rhel.sh ;;
287-
9.7)
288-
$GLUTEN_VELOX_SCRIPT_HOME/setup-rhel.sh ;;
283+
elif [[ "$LINUX_DISTRIBUTION" == "rhel" || "$LINUX_DISTRIBUTION" == "rocky" || \
284+
"$LINUX_DISTRIBUTION" == "almalinux" ]]; then
285+
case "${LINUX_VERSION_ID%%.*}" in
286+
9)
287+
$GLUTEN_VELOX_SCRIPT_HOME/setup-rhel.sh ;;
289288
*)
290-
echo "Unsupported rhel version: $LINUX_VERSION_ID"
289+
echo "Unsupported ${LINUX_DISTRIBUTION} version: $LINUX_VERSION_ID"
291290
exit 1
292291
;;
293292
esac

ep/build-velox/src/get-velox.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,12 @@ function setup_linux {
196196
exit 1
197197
;;
198198
esac
199-
elif [[ "$LINUX_DISTRIBUTION" == "rhel" ]]; then
200-
case "$LINUX_VERSION_ID" in
201-
9.6) ;;
202-
9.7) ;;
199+
elif [[ "$LINUX_DISTRIBUTION" == "rhel" || "$LINUX_DISTRIBUTION" == "rocky" || \
200+
"$LINUX_DISTRIBUTION" == "almalinux" ]]; then
201+
case "${LINUX_VERSION_ID%%.*}" in
202+
9) ;;
203203
*)
204-
echo "Unsupported rhel version: $LINUX_VERSION_ID"
204+
echo "Unsupported ${LINUX_DISTRIBUTION} version: $LINUX_VERSION_ID"
205205
exit 1
206206
;;
207207
esac

0 commit comments

Comments
 (0)