summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLiping Ke <liping.ke@intel.com>2011-03-17 13:28:42 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-17 12:33:48 +0000
commita440c6371d2ab37715b21ccdfd40cc1b35b3f814 (patch)
tree50bc66eca4948d74b516db4f8e9a5c8f4aa25609 /meta
parent06c755cb1a96df69fd2d8937f49592a3581af2aa (diff)
downloadpoky-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')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/adt_installer13
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal6
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb2
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 b1b497002e..d7a40c2479 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
236#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb) 236#Need two input params, $1 -- arch_type(arm powerpc x86 mips) $2 rootfs_image_type (a list of sdk sato minimal lsb)
237get_qemu_image() 237get_qemu_image()
238{ 238{
239 if [ "$1" == "x86" ]; then 239
240 qemu_kernel="bzImage-qemu$1.bin" 240 local target=`echo "$1" | sed -e 's/x86_64/x86-64/'`
241
242 if [ "$1" == "x86" ] || [ "$1" == "x86_64" ]; then
243 qemu_kernel="bzImage-qemu$target.bin"
241 elif [ "$1" == "mips" ]; then 244 elif [ "$1" == "mips" ]; then
242 qemu_kernel="vmlinux-qemu$1.bin" 245 qemu_kernel="vmlinux-qemu$target.bin"
243 else 246 else
244 qemu_kernel="zImage-qemu$1.bin" 247 qemu_kernel="zImage-qemu$target.bin"
245 fi 248 fi
246 249
247 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" 250 #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
@@ -250,7 +253,7 @@ get_qemu_image()
250 253
251 for image_type in $select_rootfs; do 254 for image_type in $select_rootfs; do
252 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" 255 #echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2"
253 filename="poky-image-$image_type-qemu$1.tar.bz2" 256 filename="poky-image-$image_type-qemu$target.tar.bz2"
254 download_file qemu$1/$filename 257 download_file qemu$1/$filename
255 check_result 258 check_result
256 done 259 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 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
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb
index ff7afe6623..7e82c92677 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"
82do_package_write_deb[noexec] = "1" 82do_package_write_deb[noexec] = "1"
83do_poplulate_sysroot[noexec] = "1" 83do_poplulate_sysroot[noexec] = "1"
84 84
85addtask deploy before do_populate_sysroot after do_unpack 85addtask deploy before do_populate_sysroot after do_patch