Skip to content

Commit

Permalink
Merge pull request apel#319 from Sae126V/GT-298-Issue-with-SSM-RPM-Bu…
Browse files Browse the repository at this point in the history
…ild-in-EL9

Issue with ssm rpm build in el9
  • Loading branch information
tofu-rocketry authored Apr 10, 2024
2 parents 34e16d4 + 914cf48 commit d3a9364
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions scripts/ssm-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ rm -f "$TAR_FILE"
# Get supplied Python version
PY_VERSION="$(basename "$PYTHON_ROOT_DIR")"
PY_NUM=${PY_VERSION#python}
OS_EXTENSION="$(uname -r | grep -o 'el[7-9]' || echo '_all')"

# Universal FPM Call
FPM_CORE="fpm -s python \
Expand Down Expand Up @@ -134,8 +135,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then
--depends libsasl2-dev \
--depends openssl "

OS_EXTENSION="_all"

# Currently builds for el8
elif [[ "$PACK_TYPE" = "rpm" ]]; then
FPM_PYTHON="--depends python3 \
Expand All @@ -144,8 +143,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then
--depends python3-ldap \
--depends openssl \
--depends openssl-devel "

OS_EXTENSION="el8"
fi

elif [[ ${PY_NUM:0:1} == "2" ]]; then
Expand All @@ -160,8 +157,6 @@ elif [[ ${PY_NUM:0:1} == "2" ]]; then
--depends libsasl2-dev \
--depends openssl "

OS_EXTENSION="_all"

# el7 and below, due to yum package versions
elif [[ "$PACK_TYPE" = "rpm" ]]; then
FPM_PYTHON="--depends python2 \
Expand All @@ -170,15 +165,14 @@ elif [[ ${PY_NUM:0:1} == "2" ]]; then
--depends python-ldap \
--depends openssl \
--depends openssl-devel "

OS_EXTENSION="el7"
fi
fi

# python-bin must always be specified in modern linux
PACKAGE_VERSION="--$PACK_TYPE-changelog $SOURCE_DIR/ssm-$VERSION-$ITERATION/CHANGELOG \
--$PACK_TYPE-dist $OS_EXTENSION \
--python-bin /usr/bin/$PY_VERSION \
--python-install-bin /usr/bin \
--python-install-lib $PYTHON_ROOT_DIR$LIB_EXTENSION \
--exclude *.pyc \
--package $BUILD_DIR \
Expand Down

0 comments on commit d3a9364

Please sign in to comment.