From 236ade088cc476012f667e3c4f6116057a651bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSae126V=E2=80=9D?= <“saitejav2021@gmail.com”> Date: Wed, 18 Sep 2024 15:59:35 +0000 Subject: [PATCH 1/2] Move python3-daemon dependency to apel-ssm-service The daemon is only needed when running SSM as a reciver service/daemon. Having it as a requirement for the base SSM package caused issues for users. --- scripts/ssm-build.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/ssm-build.sh b/scripts/ssm-build.sh index 8546c6a3..20a66d65 100755 --- a/scripts/ssm-build.sh +++ b/scripts/ssm-build.sh @@ -131,7 +131,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then --depends python3-pip \ --depends python3-cryptography \ --depends python3-openssl \ - --depends python3-daemon \ --depends 'python3-stomp' \ --depends openssl " @@ -142,7 +141,6 @@ if [[ ${PY_NUM:0:1} == "3" ]]; then --depends python3-pip \ --depends python3-cryptography \ --depends python3-pyOpenSSL \ - --depends python3-daemon \ --depends openssl \ --depends openssl-devel " fi @@ -176,6 +174,7 @@ fpm -s pleaserun -t "$PACK_TYPE" \ --architecture all \ --no-auto-depends \ --depends apel-ssm \ +--depends python3-daemon \ --package "$BUILD_DIR" \ /usr/bin/ssmreceive From caadaf101dde9736121d502dccc67d6cc4ec6dd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9CSae126V=E2=80=9D?= <“saitejav2021@gmail.com”> Date: Thu, 19 Sep 2024 15:04:33 +0000 Subject: [PATCH 2/2] Add python3-dirq as dependency for apel-ssm-service The receiver has to use dirq when receiving as that's what the APEL loader expects to find. Whereas the non-dirq sending is a convenience for non-APEL client sites who just want to dump files into a directory for sending without worrying about the dirq naming schema (so it is optional). --- scripts/ssm-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/ssm-build.sh b/scripts/ssm-build.sh index 20a66d65..cf38c4a9 100755 --- a/scripts/ssm-build.sh +++ b/scripts/ssm-build.sh @@ -175,6 +175,7 @@ fpm -s pleaserun -t "$PACK_TYPE" \ --no-auto-depends \ --depends apel-ssm \ --depends python3-daemon \ +--depends python3-dirq \ --package "$BUILD_DIR" \ /usr/bin/ssmreceive