summaryrefslogtreecommitdiffstats
path: root/tools/ubuntu-server-cloudimg-modify.sh
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-03-20 01:52:25 -0700
committerJing Lu <lvjing5@huawei.com>2017-03-22 08:12:55 +0000
commit2ee902070084ebec2f3bf3d5729a6766d634758d (patch)
tree5d2e790afa46313f3efa979945dcd6a4e1d14c3a /tools/ubuntu-server-cloudimg-modify.sh
parent59334b879dc479a1b3512c133160978f088d7511 (diff)
Bugfix: remove vivid as it is EOL
Vivid is end of life, and thus not supported. Change-Id: Ia293fcd6fd2a3279a642a6dbbb7ad1811334c3e1 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com> (cherry picked from commit 14172bb39e8e30f37ec5bb80be6b187ab6858e88)
Diffstat (limited to 'tools/ubuntu-server-cloudimg-modify.sh')
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh31
1 files changed, 3 insertions, 28 deletions
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index 3c0e3be54..4b0c07a5b 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -46,17 +46,6 @@ chpasswd: { expire: False }
ssh_pwauth: True
EOF
apt-get update
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- apt-get install -y \
- linux-headers-"$(echo ${CLOUD_KERNEL_VERSION} | cut -d'-' -f3,4,5)" \
- unzip
- #resize root partition (/dev/vdb1) It is supposed to be default but the image is booted differently for arm64
-cat <<EOF >/etc/cloud/cloud.cfg.d/15_growpart.cfg
-#cloud-config
-bootcmd:
- - [growpart, /dev/vdb, 1]
-EOF
-fi
apt-get install -y \
bc \
fio \
@@ -81,16 +70,8 @@ CLONE_DEST=/opt/tempT
# remove before cloning
rm -rf -- "${CLONE_DEST}"
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
- unzip master.zip && rm master.zip
- mkdir "${CLONE_DEST}"
- mv byte-unixbench-master/UnixBench "${CLONE_DEST}"
- sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \
- -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' "${CLONE_DEST}/UnixBench/Makefile"
-else
- git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
-fi
+git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
+
make --directory "${CLONE_DEST}/UnixBench/"
git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed"
@@ -99,13 +80,7 @@ cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
mkdir temp
bash build.sh
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
- unzip master.zip && rm master.zip
- mv cachestat-master/cachestat "${CLONE_DEST}"
-else
- git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
-fi
+git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
# restore symlink
ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf