sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

adt-installer: Corrected wrong environment file names. 

[YOCTO #2055]
1. Corrected the wrong environment file name for powerpc.

2. Removed unnecessary variables in adt_installer.conf.

(From OE-Core rev: 9c52fe75b7f77feda075e9c5296448dea6ff7922)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Lianhao Lu 2012-03-07 10:06:47 +08:00 committed by Richard Purdie
parent 3f6ed2c850
commit 6bd23e0faf
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
View File

@ -175,6 +175,8 @@ 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

5
meta/recipes-devtools/installer/adt-installer_1.0.bb
View File

@ -30,7 +30,7 @@ ALLOW_EMPTY = "1"
PACKAGES = ""
PR = "r6"
PR = "r7"
ADT_DEPLOY = "${TMPDIR}/deploy/sdk/"
ADT_DIR = "${WORKDIR}/adt-installer/"
@ -68,9 +68,6 @@ fakeroot do_populate_adt () {
cp -r scripts ${ADT_DIR}/
cp adt_installer ${ADT_DIR}
cp adt_installer.conf ${ADT_DIR}
echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf
cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf
mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf
sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf
echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define
echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define