summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2012-03-30 14:06:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-30 16:06:55 +0100
commitbebcac5e6eaceb7bdafa6432e42fe8073a42c6d2 (patch)
tree8564b84922eef991d17a373f1abe043ea9964bce
parentd1ffae623ea9a6be3d2cb9067f64f33cc1fd1e8a (diff)
downloadopenembedded-core-bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2.tar.gz
openembedded-core-bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2.tar.bz2
openembedded-core-bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2.tar.xz
openembedded-core-bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2.zip
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 <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
-rw-r--r--meta/recipes-devtools/installer/adt-installer_1.0.bb2
2 files changed, 1 insertions, 3 deletions
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 684dc880c..620109511 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 27937d96d..07bef882d 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/"