diff options
Diffstat (limited to 'meta')
-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 | 5 |
2 files changed, 3 insertions, 4 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 6201095117..684dc880cf 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -175,6 +175,8 @@ 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*` | ||
178 | else | 180 | else |
179 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` | 181 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` |
180 | fi | 182 | fi |
diff --git a/meta/recipes-devtools/installer/adt-installer_1.0.bb b/meta/recipes-devtools/installer/adt-installer_1.0.bb index 340349d2c3..27937d96db 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 = "r6" | 33 | PR = "r7" |
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/" |
@@ -68,9 +68,6 @@ fakeroot do_populate_adt () { | |||
68 | cp -r scripts ${ADT_DIR}/ | 68 | cp -r scripts ${ADT_DIR}/ |
69 | cp adt_installer ${ADT_DIR} | 69 | cp adt_installer ${ADT_DIR} |
70 | cp adt_installer.conf ${ADT_DIR} | 70 | cp adt_installer.conf ${ADT_DIR} |
71 | echo 'YOCTOADT_VERSION=${SDK_VERSION}' > ${ADT_DIR}/temp.conf | ||
72 | cat ${ADT_DIR}/adt_installer.conf >> ${ADT_DIR}/temp.conf | ||
73 | mv ${ADT_DIR}/temp.conf ${ADT_DIR}/adt_installer.conf | ||
74 | sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf | 71 | sed -i -e 's#YOCTOADT_VERSION#${SDK_VERSION}#' ${ADT_DIR}/adt_installer.conf |
75 | echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define | 72 | echo 'SDK_VENDOR=${SDK_VENDOR}' >> ${ADT_DIR}/scripts/data_define |
76 | echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define | 73 | echo 'INSTALL_FOLDER=${SDKPATH}' >> ${ADT_DIR}/scripts/data_define |