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 | |
| 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')
3 files changed, 12 insertions, 9 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer b/meta/recipes-devtools/installer/adt-installer/adt_installer index b1b4970..d7a40c2 100755 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer @@ -236,12 +236,15 @@ wget "$YOCTOADT_IPKG_REPO/$1" -P $LOCAL_DOWNLOAD --progress=bar:force 2>&1 | tee #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() { - if [ "$1" == "x86" ]; then - qemu_kernel="bzImage-qemu$1.bin" + + local target=`echo "$1" | sed -e 's/x86_64/x86-64/'` + + if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then + qemu_kernel="bzImage-qemu$target.bin" elif [ "$1" == "mips" ]; then - qemu_kernel="vmlinux-qemu$1.bin" + qemu_kernel="vmlinux-qemu$target.bin" else - qemu_kernel="zImage-qemu$1.bin" + qemu_kernel="zImage-qemu$target.bin" fi #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" @@ -250,7 +253,7 @@ get_qemu_image() for image_type in $select_rootfs; do #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" - filename="poky-image-$image_type-qemu$1.tar.bz2" + filename="poky-image-$image_type-qemu$target.tar.bz2" download_file qemu$1/$filename check_result done 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 diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index ff7afe6..7e82c92 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb @@ -82,4 +82,4 @@ do_package_write_rpm[noexec] = "1" do_package_write_deb[noexec] = "1" do_poplulate_sysroot[noexec] = "1" -addtask deploy before do_populate_sysroot after do_unpack +addtask deploy before do_populate_sysroot after do_patch |
