aboutsummaryrefslogtreecommitdiffstats
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_installer33
1 files changed, 17 insertions, 16 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer
index a6042b9c2d..76afcf36ed 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -233,44 +233,44 @@ wget "$YOCTOADT_REPO/rootfs/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | t
-#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb)
-get_qemu_image()
+#Need three input params:
+# $1 arch_type(arm powerpc x86 mips)
+# $2 machine(qemuarm beagleboard)
+# $3 rootfs_image_type (a list of sdk sato minimal lsb)
+get_image()
{
+ local machine=$2
- local target=`echo "$1" | sed -e 's/x86_64/x86-64/'`
-
if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then
- qemu_kernel="bzImage-qemu$target.bin"
+ kernel="bzImage-$machine.bin"
elif [ "$1" == "ppc" ] || [ "$1" == "mips" ]; then
- qemu_kernel="vmlinux-qemu$target.bin"
+ kernel="vmlinux-$machine.bin"
else
- qemu_kernel="zImage-qemu$target.bin"
+ kernel="zImage-$machine.bin"
fi
#echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
- download_file qemu$1/$qemu_kernel
+ download_file $machine/$kernel
check_result
for image_type in $select_rootfs; do
- #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-qemu$1.tar.bz2"
- filename="core-image-$image_type-qemu$target.tar.bz2"
- download_file qemu$1/$filename
+ #echo_info "[ADT_INST] Downloading rootfs file: core-image-$image_type-$machine.tar.bz2"
+ filename="core-image-$image_type-$machine.tar.bz2"
+ download_file $machine/$filename
check_result
done
}
download_images()
{
- #select_target_var="\$YOCTOADT_TARGET_$1"
- #select_target=`eval echo $select_target_var`
-
- #if [ "$select_target" == "Y" ]; then
select_rootfs_var="\$YOCTOADT_ROOTFS_$1"
select_sysroot_image_var="\$YOCTOADT_TARGET_SYSROOT_IMAGE_$1"
select_sysroot_var="\$YOCTOADT_TARGET_SYSROOT_LOC_$1"
+ select_machine_var="\$YOCTOADT_TARGET_MACHINE_$1"
select_rootfs=`eval echo $select_rootfs_var`
select_sysroot_image=`eval echo $select_sysroot_image_var`
select_sysroot=`eval echo $select_sysroot_var`
+ select_machine=`eval echo $select_machine_var`
if [ -n "$select_sysroot" ]; then
select_sysroot=`readlink -m $select_sysroot`
@@ -282,13 +282,14 @@ download_images()
#echo_info "# To be downloaded rootfs image details defined in adt_installer.conf"
#echo_info "############################################################################"
echo_info "# Target architecture:\t\t$1"
+ echo_info "# Target machine:\t\t$select_machine"
echo_info "# Root_fs images:\t\t$select_rootfs"
echo_info "# Target sysroot image:\t\t$select_sysroot_image"
echo_info "# Target sysroot loc:\t\t$select_sysroot"
echo_info "\n"
#echo_info "############################################################################\n"
else
- get_qemu_image $1 $select_rootfs
+ get_image $1 $select_machine $select_rootfs
fi
fi
}