summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index e1d4e63b18..65b1b54c72 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -170,7 +170,9 @@ fi
170 170
171echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot" 171echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot"
172 172
173sysroot_image_name="poky-image-$target_sysroot_image-qemu$1.tar.bz2" 173
174qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'`
175sysroot_image_name="poky-image-$target_sysroot_image-qemu$qemu_type.tar.bz2"
174 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." 176 #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
175 177
176scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type 178scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type
@@ -179,8 +181,6 @@ check_result
179echo_info "Updating environment script with target sysroot location." 181echo_info "Updating environment script with target sysroot location."
180if [ "$1" == "x86" ]; then 182if [ "$1" == "x86" ]; then
181 env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` 183 env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
182elif [ "$1" == "ppc" ]; then
183 env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
184else 184else
185 env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` 185 env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
186fi 186fi