Merge branch 'master' of git.curoverse.com:arvados into 11876-r-sdk
authorFuad Muhic <fmuhic@capeannenterprises.com>
Tue, 19 Dec 2017 17:03:41 +0000 (18:03 +0100)
committerFuad Muhic <fmuhic@capeannenterprises.com>
Tue, 19 Dec 2017 17:03:41 +0000 (18:03 +0100)
Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

build/run-build-packages-one-target.sh

index c675a2407c590d8255052d502558b3391bc0c69b..ff82e46e049b2014889ffc237a53258fd03e70ae 100755 (executable)
@@ -161,7 +161,6 @@ popd
 
 if test -z "$packages" ; then
     packages="arvados-api-server
-        arvados-docker-cleaner
         arvados-git-httpd
         arvados-node-manager
         arvados-src
@@ -176,14 +175,14 @@ if test -z "$packages" ; then
         keep-rsync
         keepstore
         keep-web
-        libarvados-perl"
+        libarvados-perl
+        python-arvados-fuse
+        python-arvados-python-client
+        python-arvados-cwl-runner"
 
-    case "$TARGET" in
-        *)
-            packages="$packages python-arvados-fuse
-                  python-arvados-python-client python-arvados-cwl-runner"
-            ;;
-    esac
+    if [[ $TARGET != centos7 ]]; then
+        packages="$packages arvados-docker-cleaner"
+    fi
 fi
 
 FINAL_EXITCODE=0