diff options
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 6 |
1 files changed, 4 insertions, 2 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 bc9206981c..e1d4e63b18 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -29,7 +29,6 @@ parse_config() | |||
29 | case $INST_ARCH in | 29 | case $INST_ARCH in |
30 | i[3-6]86) | 30 | i[3-6]86) |
31 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 | 31 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 |
32 | #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" | ||
33 | POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" | 32 | POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" |
34 | ;; | 33 | ;; |
35 | x86_64) | 34 | x86_64) |
@@ -106,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE | |||
106 | check_result | 105 | check_result |
107 | 106 | ||
108 | for native_target_type in $YOCTOADT_TARGETS; do | 107 | for native_target_type in $YOCTOADT_TARGETS; do |
109 | native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'` | 108 | native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'` |
110 | echo_info "Installing cross toolchain for $native_target_type ..." | 109 | echo_info "Installing cross toolchain for $native_target_type ..." |
111 | echo_info "Installing binutils for $native_target_type ..." | 110 | echo_info "Installing binutils for $native_target_type ..." |
112 | $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE | 111 | $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE |
@@ -180,9 +179,12 @@ check_result | |||
180 | echo_info "Updating environment script with target sysroot location." | 179 | echo_info "Updating environment script with target sysroot location." |
181 | if [ "$1" == "x86" ]; then | 180 | if [ "$1" == "x86" ]; then |
182 | env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` | 181 | env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` |
182 | elif [ "$1" == "ppc" ]; then | ||
183 | env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*` | ||
183 | else | 184 | else |
184 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` | 185 | env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` |
185 | fi | 186 | fi |
187 | |||
186 | if [ ! -z "$env_filename" ]; then | 188 | if [ ! -z "$env_filename" ]; then |
187 | sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename | 189 | sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename |
188 | else | 190 | else |