summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/installer/adt-installer/scripts
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2011-08-31 12:03:06 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-31 20:10:22 +0100
commitec28538315fdf03f43f7d86892950437fcaa45ea (patch)
tree0ed7768ae00eb85e25ba2e60dc6f41f3a6629219 /meta/recipes-devtools/installer/adt-installer/scripts
parent57aa99368413571bc5333a11ce9bb65f16b3d7e9 (diff)
downloadpoky-ec28538315fdf03f43f7d86892950437fcaa45ea.tar.gz
Revert "Fix adt-installer for consistent naming for powerpc and add all arch template for installation"
This reverts commit ae4ad20edbb6ea023155f7ae2b00871d479e370d. (From OE-Core rev: 13d713dccd7fedb5a223f1292227e177d7a44164) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts')
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
2 files changed, 2 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 c7de0e2969..870931e37b 100755
--- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -105,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
105check_result 105check_result
106 106
107for native_target_type in $YOCTOADT_TARGETS; do 107for native_target_type in $YOCTOADT_TARGETS; do
108 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/'`
109 echo_info "Installing cross toolchain for $native_target_type ..." 109 echo_info "Installing cross toolchain for $native_target_type ..."
110 echo_info "Installing binutils for $native_target_type ..." 110 echo_info "Installing binutils for $native_target_type ..."
111 $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
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index 1de21d770a..2781e77032 100644
--- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define
+++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
@@ -32,7 +32,7 @@ OPKG_LIBDIR="/var/lib"
32# List all supported root fs types and target types, 32# List all supported root fs types and target types,
33# it will be used in user configuration validity checking 33# it will be used in user configuration validity checking
34YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" 34YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
35YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" 35YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
36# Different host (32 bit or 64 bit) will have different opkg 36# Different host (32 bit or 64 bit) will have different opkg
37# configuration files 37# configuration files
38YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" 38YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"