[oe-commits] Lianhao Lu : adt-installer: Adapted environment file name for powerpc.
git at git.openembedded.org
git at git.openembedded.org
Sat Mar 31 17:10:20 UTC 2012
Module: openembedded-core.git
Branch: master-next
Commit: bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bebcac5e6eaceb7bdafa6432e42fe8073a42c6d2
Author: Lianhao Lu <lianhao.lu at intel.com>
Date: Fri Mar 30 14:06:11 2012 +0800
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 at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../adt-installer/scripts/adt_installer_internal | 2 --
.../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 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/"
More information about the Openembedded-commits
mailing list