X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=BUILD.sh;h=2d5b05318ccfe089f32aaecf9fb368cf98796cc2;hb=7f1ad76dfb05e85c92eda943fb62145829b01578;hp=60f70b025776ec29223e1918ebb6ee6eeaf2722f;hpb=f22a6845feac83432bce632a7a82b7fc4081df25;p=osm%2FSO.git diff --git a/BUILD.sh b/BUILD.sh index 60f70b02..2d5b0531 100755 --- a/BUILD.sh +++ b/BUILD.sh @@ -114,10 +114,10 @@ fi if [[ $PLATFORM == ub16 ]]; then PLATFORM_REPOSITORY=${1:-OSM} - PLATFORM_VERSION=${2:-4.3.1.0.49556} + PLATFORM_VERSION=${2:-4.3.1.0.50309} elif [[ $PLATFORM == fc20 ]]; then PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published - PLATFORM_VERSION=${2:-4.3.1.0.49553-1} + PLATFORM_VERSION=${2:-4.3.1.0.50310} else echo "Internal error: unknown platform $PLATFORM" exit 1 @@ -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,13 +169,15 @@ fi # and install of the packages required to build and run # this module if $runMkcontainer; then + sudo apt-get install -y libxml2-dev libxslt-dev sudo /usr/rift/container_tools/mkcontainer --modes build --modes ext --repo ${PLATFORM_REPOSITORY} + sudo pip3 install lxml==3.4.0 fi if [[ $PLATFORM == ub16 ]]; then # install the RIFT platform code: - sudo apt-get install -y rw.toolchain-rwbase=${PLATFORM_VERSION} \ + sudo apt-get install -y --allow-downgrades rw.toolchain-rwbase=${PLATFORM_VERSION} \ rw.toolchain-rwtoolchain=${PLATFORM_VERSION} \ rw.core.mgmt-mgmt=${PLATFORM_VERSION} \ rw.core.util-util=${PLATFORM_VERSION} \ @@ -269,8 +282,6 @@ if [[ $UIPathToBuild ]]; then sudo make -C $UIPathToBuild install fi -echo "To run SO with UI please run:" -echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode' -echo -echo "To run SO without UI please run:" -echo 'sudo -H /usr/rift/rift-shell -r -i /usr/rift -a /usr/rift/.artifacts -- ./demos/launchpad.py --use-xml-mode --no-ui' +echo "Creating Service ...." +sudo $(dirname $0)/create_launchpad_service +