1
0
mirror of https://git.yoctoproject.org/poky synced 2026-07-21 05:27:01 +00:00

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>
This commit is contained in:
Liping Ke
2011-03-17 13:28:42 +08:00
committed by Richard Purdie
parent ed949c59cf
commit 37e29b5434
3 changed files with 12 additions and 9 deletions
@@ -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