mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 12:49:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

ADT: bug fix for nameing and do_patch sequence

Browse Source 
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 06c755cb1a
commit a440c6371d
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
meta/recipes-devtools/installer/adt-installer/adt_installer
View File

@@ -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) #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() 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 elif [ "$1" == "mips" ]; then
qemu_kernel="vmlinux-qemu$1.bin" qemu_kernel="vmlinux-qemu$target.bin"
else else
qemu_kernel="zImage-qemu$1.bin" qemu_kernel="zImage-qemu$target.bin"
fi fi
#echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel" #echo_info "[ADT_INST] Downloading qemu kernel binary: $qemu_kernel"
@@ -250,7 +253,7 @@ get_qemu_image()
for image_type in $select_rootfs; do for image_type in $select_rootfs; do
#echo_info "[ADT_INST] Downloading rootfs file: poky-image-$image_type-qemu$1.tar.bz2" #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 download_file qemu$1/$filename
check_result check_result
done done

6
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
View File

@@ -170,7 +170,9 @@ fi
echo_info "Installing target sysroot for arch: $1, rootfs type: $target_sysroot_image, location: $target_sysroot" 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..." #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
scripts/extract_rootfs $sysroot_image_name $target_sysroot $POKY_NATIVE_SYSROOT $user_inst_type 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." echo_info "Updating environment script with target sysroot location."
if [ "$1" == "x86" ]; then if [ "$1" == "x86" ]; then
env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
elif [ "$1" == "ppc" ]; then
env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
else else
env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
fi fi

2
meta/recipes-devtools/installer/adt-installer_1.0.bb
View File

@@ -82,4 +82,4 @@ do_package_write_rpm[noexec] = "1"
do_package_write_deb[noexec] = "1" do_package_write_deb[noexec] = "1"
do_poplulate_sysroot[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