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

Update to improve the naming convention for rpm and deb builds #384

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Update to improve the naming convention for rpm and deb builds #384

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions scripts/ssm-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,13 @@ rm -f "$TAR_FILE"
# Get supplied Python version
PY_VERSION="$(basename "$PYTHON_ROOT_DIR")"
PY_NUM=${PY_VERSION#python}
PY_NUM_FOR_BUILD_NAMING=${PY_NUM/./}
OS_EXTENSION="$(uname -r | grep -o 'el[7-9]' || echo '_all')"

# Universal FPM Call
FPM_CORE="fpm -s python \
-t $PACK_TYPE \
-n apel-ssm \
-n apel-ssm-py${PY_NUM_FOR_BUILD_NAMING} \
-v $VERSION \
--iteration $ITERATION \
-m \"Apel Administrators <apel-admins@stfc.ac.uk>\" \
Expand Down Expand Up @@ -165,15 +166,15 @@ echo "== Generating pleaserun package =="

# When installed, use pleaserun to perform system specific service setup
fpm -s pleaserun -t "$PACK_TYPE" \
-n apel-ssm-service \
-n apel-ssm-service-py"${PY_NUM_FOR_BUILD_NAMING}" \
-v "$VERSION" \
--iteration "$ITERATION" \
--"$PACK_TYPE"-dist "$OS_EXTENSION" \
-m "Apel Administrators <apel-admins@stfc.ac.uk>" \
--description "Secure Stomp Messenger (SSM) Service Daemon files." \
--architecture all \
--no-auto-depends \
--depends apel-ssm \
--depends apel-ssm-py"${PY_NUM_FOR_BUILD_NAMING}" \
--depends python3-daemon \
--depends python3-dirq \
--package "$BUILD_DIR" \
Expand All @@ -187,8 +188,8 @@ then
TAG="$VERSION-$ITERATION"
DEBDIR="$(dirname "$BUILD_DIR")"

lintian "$DEBDIR"/apel-ssm_"${TAG}"_all.deb
lintian "$DEBDIR"/apel-ssm-service_"${TAG}"_all.deb
lintian "$DEBDIR"/apel-ssm-py"${PY_NUM_FOR_BUILD_NAMING}"_"${TAG}"_all.deb
lintian "$DEBDIR"/apel-ssm-service-py"${PY_NUM_FOR_BUILD_NAMING}"_"${TAG}"_all.deb
else
# Check for errors in SPEC and built packages
# For instance; Given $(dirname /root/rpmb/rpmbuild/source) will output "/root/rpmb/rpmbuild".
Expand Down
Loading