aboutsummaryrefslogtreecommitdiff
path: root/linaro_image_tools/media_create
diff options
context:
space:
mode:
authorFathi Boudra <fathi.boudra@linaro.org>2014-05-26 18:26:59 +0300
committerFathi Boudra <fathi.boudra@linaro.org>2014-05-26 18:35:21 +0300
commit9437a2597a621427703a4f173c2866d2e3d909da (patch)
tree9450d5e15ad199a55bbbfe8f1ea99c6a0cee0ab7 /linaro_image_tools/media_create
parent331445c6f932d5f64b669ac2618bd538a32250c5 (diff)
downloadlinaro-image-tools-9437a2597a621427703a4f173c2866d2e3d909da.tar.gz
copy qemu-aarch64-static binary in the chroot
QEMU release with arm64 support has the binary qemu-arm64-static renamed to qemu-aarch64-static. Change-Id: I8cef3d08d0e092d96518b0616ed437bc864bc36e Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Diffstat (limited to 'linaro_image_tools/media_create')
-rw-r--r--linaro_image_tools/media_create/chroot_utils.py3
-rw-r--r--linaro_image_tools/media_create/tests/test_media_create.py6
2 files changed, 6 insertions, 3 deletions
diff --git a/linaro_image_tools/media_create/chroot_utils.py b/linaro_image_tools/media_create/chroot_utils.py
index cf8f3e1..7997ee3 100644
--- a/linaro_image_tools/media_create/chroot_utils.py
+++ b/linaro_image_tools/media_create/chroot_utils.py
@@ -47,7 +47,8 @@ def prepare_chroot(chroot_dir, tmp_dir):
for root, dirs, files in os.walk('/usr/bin'):
for file in files:
# Copy all the QEMU ARM binaries
- if file.startswith('qemu-arm'):
+ if file.startswith('qemu-arm') or \
+ file.startswith('qemu-aarch64'):
file_name = os.path.join(root, file)
copy_file(file_name,
os.path.join(chroot_dir, 'usr', 'bin'))
diff --git a/linaro_image_tools/media_create/tests/test_media_create.py b/linaro_image_tools/media_create/tests/test_media_create.py
index 0d8f6aa..937d942 100644
--- a/linaro_image_tools/media_create/tests/test_media_create.py
+++ b/linaro_image_tools/media_create/tests/test_media_create.py
@@ -4168,10 +4168,12 @@ class TestInstallHWPack(TestCaseWithFixtures):
expected = [
'cp /etc/resolv.conf chroot/etc',
'cp /etc/hosts chroot/etc',
- 'cp /usr/bin/qemu-arm-static chroot/usr/bin',
'cp /usr/bin/qemu-armeb-static chroot/usr/bin',
- 'rm -f chroot/usr/bin/qemu-armeb-static',
+ 'cp /usr/bin/qemu-arm-static chroot/usr/bin',
+ 'cp /usr/bin/qemu-aarch64-static chroot/usr/bin',
+ 'rm -f chroot/usr/bin/qemu-aarch64-static',
'rm -f chroot/usr/bin/qemu-arm-static',
+ 'rm -f chroot/usr/bin/qemu-armeb-static',
'rm -f chroot/etc/hosts',
'rm -f chroot/etc/resolv.conf']
expected = [