summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/adt_installer
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/adt_installer')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer13
1 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index b1b497002e..d7a40c2479 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -236,12 +236,15 @@ wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee
236#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb) 236#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb)
237get_qemu_image() 237get_qemu_image()
238{ 238{
239 if [ "$1" == "x86" ]; then 239
240 qemu_kernel="bzImage-qemu$1.bin" 240 local target=`echo "$1" | sed -e 's/x86_64/x86-64/'`
241
242 if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then
243 qemu_kernel="bzImage-qemu$target.bin"
241 elif [ "$1" == "mips" ]; then 244 elif [ "$1" == "mips" ]; then
242 qemu_kernel="vmlinux-qemu$1.bin" 245 qemu_kernel="vmlinux-qemu$target.bin"
243 else 246 else
244 qemu_kernel="zImage-qemu$1.bin" 247 qemu_kernel="zImage-qemu$target.bin"
245 fi 248 fi
246 249
247 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" 250 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
@@ -250,7 +253,7 @@ get_qemu_image()
250 253
251 for image_type in $select_rootfs; do 254 for image_type in $select_rootfs; do
252 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" 255 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2"
253 filename="poky-image-$image_type-qemu$1.tar.bz2" 256 filename="poky-image-$image_type-qemu$target.tar.bz2"
254 download_file qemu$1/$filename 257 download_file qemu$1/$filename
255 check_result 258 check_result
256 done 259 done