diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2012-03-30 14:06:11 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-03-30 17:20:24 +0100 |
commit | 899aa3f2161ed72ab294e0be5e734771c1886ffd (patch) | |
tree | c1c1ee6fd1efce88eca9111f8e9bca86a9bc4601 /meta/recipes-devtools/installer | |
parent | caf3f8209863b3d94d8076e7f53236ed8383c931 (diff) | |
download | poky-899aa3f2161ed72ab294e0be5e734771c1886ffd.tar.gz |
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 <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer_1.0.bb | 2 |
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 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 | |||
175 | echo_info "Updating environment script with target sysroot location." | 175 | echo_info "Updating environment script with target sysroot location." |
176 | if [ "$1" == "x86" ]; then | 176 | if [ "$1" == "x86" ]; then |
177 | env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` | 177 | env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` |
178 | elif [ "$1" == "ppc" ]; then | ||
179 | env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*` | ||
180 | else | 178 | else |
181 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` | 179 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` |
182 | fi | 180 | 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" | |||
30 | 30 | ||
31 | PACKAGES = "" | 31 | PACKAGES = "" |
32 | 32 | ||
33 | PR = "r7" | 33 | PR = "r8" |
34 | 34 | ||
35 | ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" | 35 | ADT_DEPLOY = "${TMPDIR}/deploy/sdk/" |
36 | ADT_DIR = "${WORKDIR}/adt-installer/" | 36 | ADT_DIR = "${WORKDIR}/adt-installer/" |