X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=install.sh;h=b8212d2f4af1b80fd4a228aa68631a4e840c793f;hb=refs%2Fchanges%2F07%2F36507%2F3;hp=25a4f5960f4c622dc9f476c8b4e651f780f3cbaf;hpb=d2cb7ce7331d8da4c3b5b70b09dac49cf65d1710;p=yardstick.git diff --git a/install.sh b/install.sh index 25a4f5960..b8212d2f4 100755 --- a/install.sh +++ b/install.sh @@ -22,12 +22,15 @@ deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-updates main unive deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-security main universe multiverse restricted deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ trusty-proposed main universe multiverse restricted" > "${sub_source_file}" echo "vm.mmap_min_addr = 0" > /etc/sysctl.d/mmap_min_addr.conf -dpkg --add-architecture arm64 + +proc_type=$(uname -m) +if [[ $proc_type == "arm"* ]]; then + dpkg --add-architecture arm64 +fi # install tools apt-get update && apt-get install -y \ qemu-user-static/xenial \ - libc6:arm64 \ wget \ expect \ curl \ @@ -47,9 +50,11 @@ apt-get update && apt-get install -y \ uwsgi-plugin-python \ supervisor \ python-pip \ - vim \ - python-setuptools && \ - easy_install -U setuptools==30.0.0 + vim + +if [[ $proc_type == "arm"* ]]; then + apt-get install -y libc6:arm64 +fi apt-get -y autoremove && apt-get clean