mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-14 21:49:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

adt: fix ppc/powerpcc naming bug

Browse Source 
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>
This commit is contained in:
Liping Ke
2011-03-14 17:43:22 +08:00
committed by Saul Wold
parent 8797e389c6
commit 95fa18fd1b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ parse_config()
case $INST_ARCH in case $INST_ARCH in
i[3-6]86) i[3-6]86)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
#POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/"
POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
;; ;;
x86_64) x86_64)
@@ -106,7 +105,7 @@ $OPKG_INSTALL_NATIVE_CMD libtool-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
check_result check_result
for native_target_type in $YOCTOADT_TARGETS; do for native_target_type in $YOCTOADT_TARGETS; do
native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/x86$/i586/'` native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'`
echo_info "Installing cross toolchain for $native_target_type ..." echo_info "Installing cross toolchain for $native_target_type ..."
echo_info "Installing binutils for $native_target_type ..." echo_info "Installing binutils for $native_target_type ..."
$OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE $OPKG_INSTALL_NATIVE_CMD binutils-cross-canadian-$native_target_type &>> $YOCTOADT_INSTALL_LOG_FILE
@@ -180,9 +179,12 @@ check_result
echo_info "Updating environment script with target sysroot location." echo_info "Updating environment script with target sysroot location."
if [ "$1" == "x86" ]; then if [ "$1" == "x86" ]; then
env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*` env_filename=`ls $INSTALL_FOLDER/environment-setup-i586*`
elif [ "$1" == "ppc" ]; then
env_filename=`ls $INSTALL_FOLDER/environment-setup-powerpc*`
else else
env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*` env_filename=`ls $INSTALL_FOLDER/environment-setup-$1*`
fi fi
if [ ! -z "$env_filename" ]; then if [ ! -z "$env_filename" ]; then
sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename sudo sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename
else else

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

@@ -32,7 +32,7 @@ OPKG_LIBDIR="/var/lib"
# List all supported root fs types and target types, # List all supported root fs types and target types,
# it will be used in user configuration validity checking # it will be used in user configuration validity checking
YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk"
YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips"
# Different host (32 bit or 64 bit) will have different opkg # Different host (32 bit or 64 bit) will have different opkg
# configuration files # configuration files
YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf"