diff options
| author | Jessica Zhang <jessica.zhang@intel.com> | 2011-08-31 12:03:06 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-31 20:10:01 +0100 |
| commit | 13d713dccd7fedb5a223f1292227e177d7a44164 (patch) | |
| tree | f0d75e1fa63a4e63a1b9f6074b89440d7746b590 /meta | |
| parent | 9864b0a8253922e044f61506a4a8e9064aac2bd7 (diff) | |
| download | openembedded-core-13d713dccd7fedb5a223f1292227e177d7a44164.tar.gz openembedded-core-13d713dccd7fedb5a223f1292227e177d7a44164.tar.bz2 openembedded-core-13d713dccd7fedb5a223f1292227e177d7a44164.tar.xz openembedded-core-13d713dccd7fedb5a223f1292227e177d7a44164.zip | |
Revert "Fix adt-installer for consistent naming for powerpc and add all arch template for installation"
This reverts commit ae4ad20edbb6ea023155f7ae2b00871d479e370d.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 4 insertions, 17 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index e31f9afa1..0c93237ef 100644 --- a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf +++ b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf @@ -27,7 +27,7 @@ YOCTOADT_REPO="http://adtrepo.yoctoproject.org/$YOCTOADT_VERSION" # The following are for system wide setup # Target architectures that you want to setup host cross dev environment for -# valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries +# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries YOCTOADT_TARGETS="arm x86" # Whether install qemu or not, valid entries are: Y/N YOCTOADT_QEMU="Y" @@ -40,7 +40,7 @@ YOCTOADT_NFS_UTIL="Y" #The followings are for setting up specific target architecture #YOCTOADT_ROOTFS_$arch is for specifying what root filesystem image files you want to download from the repository. The valid values to replace $arch are: arm, x86, x86_64, powerpc, mips. The valid image files are: minimal, minimal-dev, sato, sato-dev, sato-sdk,lsb, lsb-dev, lsb-sdk. If you want to download multiple images, the entries are space separated -YOCTOADT_ROOTFS_arm="minimal" +YOCTOADT_ROOTFS_arm="minimal sato-sdk" #Specify which root filesystem file to use to extract as target sysroot. Please ensure the entry is in the list of downloaded root filesystem files that specified above in YOCTOADT_ROOTFS_$arch YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" #The location where the target sysroot will be setup @@ -50,16 +50,3 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm" #YOCTOADT_ROOTFS_x86="sato-sdk" #YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" #YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" - -#Here's some template of other arches, which you need to change the value in "" -#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64="" -#YOCTOADT_TARGET_SYSROOT_LOC_x86_64="" -#YOCTOADT_ROOTFS_x86_64="" - -#YOCTOADT_TARGET_SYSROOT_IMAGE_powerpc="" -#YOCTOADT_TARGET_SYSROOT_LOC_powerpc="" -#YOCTOADT_ROOTFS_powerpc="" - -#YOCTOADT_TARGET_SYSROOT_IMAGE_mips="" -#YOCTOADT_TARGET_SYSROOT_LOC_mips="" -#YOCTOADT_ROOTFS_mips="" 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 c7de0e296..870931e37 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 check_result 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 binutils for $native_target_type ..." $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 1de21d770..2781e7703 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" # List all supported root fs types and target types, # 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_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 # configuration files YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" |