From 3d595c9b4cda969d75715395a29057e1740568e3 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 12 Aug 2015 22:36:13 -0400 Subject: [PATCH] 6934: Build libpam-arvados only for targets that have libpam-python. --- jenkins/run-build-packages.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh index b1ff4be..58c63ac 100755 --- a/jenkins/run-build-packages.sh +++ b/jenkins/run-build-packages.sh @@ -563,9 +563,11 @@ rm -rf "$WORKSPACE/sdk/python/build" fpm_build $WORKSPACE/sdk/python "${PYTHON2_PKG_PREFIX}-arvados-python-client" 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/python/arvados_python_client.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=The Arvados Python SDK" --deb-recommends=git # The PAM module -cd $WORKSPACE/packages/$TARGET -rm -rf "$WORKSPACE/sdk/pam/build" -fpm_build $WORKSPACE/sdk/pam libpam-arvados 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/pam/arvados_pam.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=PAM module for authenticating shell logins using Arvados API tokens" --depends libpam-python +if [[ $TARGET =~ debian|ubuntu ]]; then + cd $WORKSPACE/packages/$TARGET + rm -rf "$WORKSPACE/sdk/pam/build" + fpm_build $WORKSPACE/sdk/pam libpam-arvados 'Curoverse, Inc.' 'python' "$(awk '($1 == "Version:"){print $2}' $WORKSPACE/sdk/pam/arvados_pam.egg-info/PKG-INFO)" "--url=https://arvados.org" "--description=PAM module for authenticating shell logins using Arvados API tokens" --depends libpam-python +fi # The FUSE driver # Please see comment about --no-python-fix-name above; we stay consistent and do -- 2.39.5