summaryrefslogtreecommitdiffstats
path: root/tools/yardstick-img-modify
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/yardstick-img-modify
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/yardstick-img-modify')
-rwxr-xr-xtools/yardstick-img-modify29
1 files changed, 0 insertions, 29 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 2bb1ad447..599768555 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -76,27 +76,6 @@ download() {
[ -a /dev/loop$i ] || mknod -m 660 /dev/loop$i b 7 $i
done
- if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- cd /tmp
- if [ ! -f /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt ]; then
- wget http://${host}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt
- fi
- export CLOUD_KERNEL_VERSION=$(cut -d$'\t' -f4 ${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt)
-
- mkdir -p /tmp/${release}-modules
- if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" ]; then
- wget $CLOUD_IMG_URL
- fi
- if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img" ]; then
- tar zxvf ${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz ${release}-server-cloudimg-${YARD_IMG_ARCH}.img
- fi
- mkdir -p /mnt/${release}
- mount /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img /mnt/${release}
- cp -r /mnt/${release}/lib/modules/$(echo $CLOUD_KERNEL_VERSION) /tmp/${release}-modules
- umount /mnt/${release}
- rm /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img
- cd $workspace
- fi
qemu-img convert $filename $raw_imgfile
cd -
}
@@ -110,10 +89,6 @@ setup() {
kpartx -av $raw_imgfile
- if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- e2fsck -p -f /dev/mapper/$loopdevice
- resize2fs /dev/mapper/$loopdevice
- fi
# for trouble shooting
sleep 2
dmsetup ls
@@ -121,10 +96,6 @@ setup() {
mount /dev/mapper/$loopdevice $mountdir
mount -t proc none $mountdir/proc
- if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- cp -r /tmp/${release}-modules/$(echo $CLOUD_KERNEL_VERSION) "$mountdir/lib/modules"
- cp $(which "qemu-aarch64-static") "$mountdir/usr/bin"
- fi
cp $cmd $mountdir/$(basename $cmd)
if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
cp /usr/bin/qemu-aarch64-static $mountdir/usr/bin