diff options
author | Liping Ke <liping.ke@intel.com> | 2011-03-17 13:28:42 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-03-17 12:33:48 +0000 |
commit | a440c6371d2ab37715b21ccdfd40cc1b35b3f814 (patch) | |
tree | 50bc66eca4948d74b516db4f8e9a5c8f4aa25609 /meta/recipes-devtools/installer/adt-installer/scripts | |
parent | 06c755cb1a96df69fd2d8937f49592a3581af2aa (diff) | |
download | ast2050-yocto-poky-a440c6371d2ab37715b21ccdfd40cc1b35b3f814.zip ast2050-yocto-poky-a440c6371d2ab37715b21ccdfd40cc1b35b3f814.tar.gz |
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.
(From OE-Core rev: 95e27a0f604796b30d7e7e1d58d0925942cfefa9)
Signed-off-by: Liping Ke <liping.ke@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 6 |
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 e1d4e63..65b1b54 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 |