X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=BUILD.sh;h=1c90a25bfb3290e2ff97d8887e44fee910e3631e;hb=cd455eba9834532e57a661e41cd5864afc90ddec;hp=c5fbb2c7c745e0d278a3aac1f24fb2dcd43066a1;hpb=04bd41e27663c295bbf345cbe03e8d8c2bad4764;p=osm%2FSO.git diff --git a/BUILD.sh b/BUILD.sh index c5fbb2c7..1c90a25b 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.53704} + PLATFORM_VERSION=${2:-4.99.1.1.58887} elif [[ $PLATFORM == fc20 ]]; then PLATFORM_REPOSITORY=${1:-OSM} # change to OSM when published - PLATFORM_VERSION=${2:-4.3.1.0.53705} + PLATFORM_VERSION=${2:-4.99.1.1.58887} else echo "Internal error: unknown platform $PLATFORM" exit 1 @@ -130,11 +130,11 @@ fi DAILY_TIMER='apt-daily.timer' DAILY_SERVICE='apt-daily.service' -if [ $(systemctl is-active $DAILY_TIMER) = "active" ] +if [ $(sudo systemctl is-active $DAILY_TIMER) = "active" ] then - systemctl stop $DAILY_TIMER - systemctl disable $DAILY_TIMER - systemctl disable $DAILY_SERVICE + sudo systemctl stop $DAILY_TIMER + sudo systemctl disable $DAILY_TIMER + sudo systemctl disable $DAILY_SERVICE fi # must be run from the top of a workspace @@ -175,7 +175,7 @@ fi 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 + sudo -H pip3 install lxml==3.4.0 fi @@ -185,9 +185,11 @@ if [[ $PLATFORM == ub16 ]]; then # ignore failures PACKAGES="rw.toolchain-rwbase rw.toolchain-rwtoolchain rw.core.mgmt-mgmt rw.core.util-util \ - rw.core.rwvx-rwvx rw.core.rwvx-rwdts rw.automation.core-RWAUTO rw.core.rwvx-rwha-1.0" - for package in $PACKAGES; do - apt remove -y $package || true + rw.core.rwvx-rwvx rw.core.rwvx-rwdts rw.automation.core-RWAUTO" + # this package is obsolete. + OLD_PACKAGES="rw.core.rwvx-rwha-1.0" + for package in $PACKAGES $OLD_PACKAGES; do + sudo apt remove -y $package || true done packages=""