Skip to content

Commit 5435692

Browse files
kun-lu20nickva
authored andcommitted
Add s390x support for rhel8 clone and replace rockylinux:9 with almalinux:9
Signed-off-by: Kun-Lu <kun.lu@ibm.com>
1 parent 353b33a commit 5435692

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

bin/detect-os.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ case "${OSTYPE}" in
6868
# and finally some rough heuristics
6969
if [[ -f /etc/redhat-release ]]; then
7070
# /etc/redhat-release is so inconsistent, we use rpm instead
71-
rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|rocky)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
71+
rhelish=$(rpm -qa '(redhat|sl|slf|centos|centos-linux|oraclelinux|almalinux)-release(|-server|-workstation|-client|-computenode)' 2>/dev/null | head -1)
7272
if [[ $rhelish ]]; then
7373
ID=${ID:-$(echo ${rhelish} | awk -F'-' '{print tolower($1)}')}
7474
VERSION_ID=${VERSION_ID:-$(echo ${rhelish} | sed -E 's/([^[:digit:]]+)([[:digit:]]+)(.*)/\2/' )}

bin/install-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ arms='(aarch64)'
8383

8484
case "${OSTYPE}" in
8585
linux*)
86-
redhats='(rhel|centos|fedora|rocky)'
86+
redhats='(rhel|centos|fedora|almalinux)'
8787
debians='(debian|ubuntu)'
8888
latest='(stretch|buster|bionic)'
8989

bin/source-erlang.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3838

3939
. ${SCRIPTPATH}/detect-os.sh
4040

41-
redhats='(rhel|centos|fedora|rocky)'
41+
redhats='(rhel|centos|fedora|almalinux)'
4242
debians='(debian|ubuntu)'
4343

4444
echo "Erlang source build started @ $(date)"

bin/yum-dependencies.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ echo "Detected RedHat/Centos/Fedora version: ${VERSION_ID} arch: ${ARCH}"
8686

8787
# Enable EPEL
8888
yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION_ID}.noarch.rpm || true
89-
# PowerTools for Rocky 8
89+
# PowerTools for Alma 8
9090
if [[ ${VERSION_ID} -eq 8 ]]; then
9191
dnf install -y 'dnf-command(config-manager)'
9292
dnf config-manager --set-enabled powertools

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SCRIPTPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
4848
#
4949
DEBIANS="debian-buster debian-bullseye"
5050
UBUNTUS="ubuntu-bionic ubuntu-focal ubuntu-jammy"
51-
CENTOSES="centos-7 rockylinux-8 rockylinux-9"
51+
CENTOSES="centos-7 almalinux-8 almalinux-9"
5252
XPLAT_BASE="debian-bullseye"
5353
XPLAT_ARCHES="arm64v8 ppc64le s390x"
5454
PASSED_BUILDARGS="$buildargs"
@@ -104,7 +104,7 @@ buildx-platform() {
104104
find-erlang-version $1
105105
pull-os-image $1
106106
split-os-ver $1
107-
if [ "$os" == "rockylinux" ]; then
107+
if [ "$os" == "almalinux" ]; then
108108
repo="centos"
109109
else
110110
repo="$os"

dockerfiles/rockylinux-8 renamed to dockerfiles/almalinux-8

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# NOTE: These are intended to be built using the arguments as
1818
# described in ../build.sh. See that script for more details.
1919

20-
FROM rockylinux:8
20+
FROM almalinux:8
2121

2222
# Install Java
2323
ENV JAVA_HOME=/opt/java/openjdk

dockerfiles/rockylinux-9 renamed to dockerfiles/almalinux-9

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# NOTE: These are intended to be built using the arguments as
1818
# described in ../build.sh. See that script for more details.
1919

20-
FROM rockylinux:9
20+
FROM almalinux:9
2121

2222
# Install Java
2323
ENV JAVA_HOME=/opt/java/openjdk

0 commit comments

Comments
 (0)