From: Maciej Skrocki <maciej.skrocki@intel.com>
Date: Tue, 16 May 2017 20:58:41 +0000 (-0700)
Subject: Added arm condition in install.sh to avoid installation error on ubuntu.
X-Git-Tag: opnfv-5.0.RC1~462^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f63050d7890d4341a5cb6af8323dbf3c5b9fe1ab;p=yardstick.git

Added arm condition in install.sh to avoid installation error on ubuntu.

Change-Id: Iaa07a8d68a7dede6f2b42440be44ed07f035b1ca
Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
---

diff --git a/install.sh b/install.sh
index dc2663628..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 \
@@ -49,6 +52,10 @@ apt-get update && apt-get install -y \
     python-pip \
     vim
 
+if [[ $proc_type == "arm"* ]]; then
+    apt-get install -y libc6:arm64
+fi
+
 apt-get -y autoremove && apt-get clean
 
 git config --global http.sslVerify false