diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-22 07:31:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-22 07:31:17 +0000 |
| commit | a594ab3f2985d9482930f2bc9bb0145106eca75f (patch) | |
| tree | 3e288769dd143e0fe6a30a17401ccde7baa7ccf9 | |
| parent | c534a3b178b2d80a07d07064e6ab74ac33a5418a (diff) | |
| parent | 742ee6f3249a6204a351fe02c1334c9b14213e51 (diff) | |
Merge "aarch64: Fix missing qemu-aarch64-static in chroot"
| -rwxr-xr-x | tools/ubuntu-server-cloudimg-modify.sh | 10 | ||||
| -rwxr-xr-x | tools/yardstick-img-modify | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh index 66a645261..66c740eb6 100755 --- a/tools/ubuntu-server-cloudimg-modify.sh +++ b/tools/ubuntu-server-cloudimg-modify.sh @@ -74,14 +74,8 @@ git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}" make --directory "${CLONE_DEST}/UnixBench/" -if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip - unzip master.zip && rm master.zip - mkdir "${CLONE_DEST}/RAMspeed" - mv ramspeed-master/* "${CLONE_DEST}/RAMspeed/" -else - git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed" -fi +git clone https://github.com/beefyamoeba5/ramspeed.git "${CLONE_DEST}/RAMspeed" + cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0" mkdir temp bash build.sh diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index 81a9ed783..599768555 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -83,9 +83,6 @@ download() { # mount image setup() { # qemu-img resize $raw_imgfile +5GB - if [ "${YARD_IMG_ARCH}" = "arm64" ]; then - echo -e "d\nn\np\n1\n\n\nw" | parted -l $raw_imgfile - fi mkdir -p $mountdir loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') @@ -100,6 +97,9 @@ setup() { mount -t proc none $mountdir/proc cp $cmd $mountdir/$(basename $cmd) + if [ "${YARD_IMG_ARCH}" = "arm64" ]; then + cp /usr/bin/qemu-aarch64-static $mountdir/usr/bin + fi } # modify image running a script using in a chrooted environment |