Merge branch 'v1.0'

[osm/SO.git] / BUILD.sh

diff --git a/BUILD.sh b/BUILD.sh
index daee105..0443cc4 100755 (executable)
--- a/BUILD.sh
+++ b/BUILD.sh
@@ -126,6 +126,17 @@ fi
 ###############################################################################
 # Main block
 
+# Disable apt-daily.service and apt-daily.timer
+
+DAILY_TIMER='apt-daily.timer'
+DAILY_SERVICE='apt-daily.service'
+if [ $(systemctl is-active $DAILY_TIMER) = "active" ]
+then
+    systemctl stop $DAILY_TIMER
+    systemctl disable $DAILY_TIMER
+    systemctl disable $DAILY_SERVICE
+fi
+
 # must be run from the top of a workspace
 cd $(dirname $0)
 
@@ -158,8 +169,8 @@ fi
 # and install of the packages required to build and run
 # this module
 if $runMkcontainer; then
-    sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY}
     sudo apt-get install -y libxml2-dev libxslt-dev
+    sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY}
 fi
 
 
@@ -173,6 +184,8 @@ if [[ $PLATFORM == ub16 ]]; then
         rw.core.rwvx-rwdts=${PLATFORM_VERSION} \
         rw.automation.core-RWAUTO=${PLATFORM_VERSION} \
          rw.core.rwvx-rwha-1.0=${PLATFORM_VERSION}
+
+    sudo apt-get install python-cinderclient
     
     sudo chmod 777 /usr/rift /usr/rift/usr/share