From: Lianhao Lu Date: Fri, 30 Mar 2012 06:06:11 +0000 (+0800) Subject: adt-installer: Adapted environment file name for powerpc. X-Git-Tag: rev_ivi_2015_02_04~17860 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b9190fbd0d943baefd9851b9fff1e9af378542bb;p=scm%2Fbb%2Ftizen-distro.git adt-installer: Adapted environment file name for powerpc. Adpated to the new environment file name for powerpc, due to the oe-core commit c2d96179. Fixed bug [YOCTO #2055]. (From OE-Core rev: bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- 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 684dc88..6201095 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal @@ -175,8 +175,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 27937d9..07bef88 100644 --- a/meta/recipes-devtools/installer/adt-installer_1.0.bb +++ b/meta/recipes-devtools/installer/adt-installer_1.0.bb @@ -30,7 +30,7 @@ ALLOW_EMPTY = "1" PACKAGES = "" -PR = "r7" +PR = "r8" ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" ADT_DIR = "${WORKDIR}/adt-installer/"