From 95e27a0f604796b30d7e7e1d58d0925942cfefa9 Mon Sep 17 00:00:00 2001 From: Liping Ke Date: Thu, 17 Mar 2011 13:28:42 +0800 Subject: ADT: bug fix for nameing and do_patch sequence This patch is for fixing the x86-64 image name bug and also, do_patch must be done before do_deploy. Signed-off-by: Liping Ke --- .../installer/adt-installer/scripts/adt_installer_internal | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal') 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 e1d4e63b1..65b1b54c7 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 echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot" -sysroot_image_name="poky-image-$target_sysroot_image-qemu$1.tar.bz2" + +qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` +sysroot_image_name="poky-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type @@ -179,8 +181,6 @@ check_result echo_info "Updating environment script with target sysroot location." if [ "$1" == "x86" ]; then env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` -elif [ "$1" == "ppc" ]; then - env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*` else env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` fi -- cgit v1.2.3