From bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 30 Mar 2012 14:06:11 +0800 Subject: 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]. Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- .../installer/adt-installer/scripts/adt_installer_internal | 2 -- meta/recipes-devtools/installer/adt-installer_1.0.bb | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'meta') 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 684dc880cf..6201095117 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 27937d96db..07bef882d8 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/" -- cgit 1.2.3-korg