summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiping Ke <liping.ke@intel.com>2011-03-14 17:43:22 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-14 21:08:36 +0000
commit1db41d8df25494dbe6cb5f100e2fbacc9aded7c1 (patch)
tree444007ece415c816da1c76a8f3e3a277041c31fe
parent367db423a6838589e3b85ab0844eb62d96b7c697 (diff)
downloadpoky-1db41d8df25494dbe6cb5f100e2fbacc9aded7c1.tar.gz
adt: fix ppc/powerpcc naming bug
for ipk files on ppc, the name should be powerpc. So does the environment file name. For the tar file name, it should be ppc. This patch is to correct the arch/machine name pair. Related Bug#864 (From OE-Core rev: 9b94486c6cc7295ed872e3c03ea297c3f3c7dcdf) Signed-off-by: Liping ke <liping.ke@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal6
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
2 files changed, 5 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 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
106check_result 105check_result
107 106
108for native_target_type in $YOCTOADT_TARGETS; do 107for 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
180echo_info "Updating environment script with target sysroot location." 179echo_info "Updating environment script with target sysroot location."
181if [ "$1" == "x86" ]; then 180if [ "$1" == "x86" ]; then
182 env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` 181 env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
182elif [ "$1" == "ppc" ]; then
183 env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
183else 184else
184 env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` 185 env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
185fi 186fi
187
186if [ ! -z "$env_filename" ]; then 188if [ ! -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
188else 190else
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define
index c7bce6d9ef..ca1d47c883 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"