summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--meta/recipes-devtools/installer/adt-installer/adt_installer.conf17
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal2
-rw-r--r--meta/recipes-devtools/installer/adt-installer/scripts/data_define2
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 e31f9afa1f..0c93237ef1 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"
27 27
28# The following are for system wide setup 28# The following are for system wide setup
29# Target architectures that you want to setup host cross dev environment for 29# Target architectures that you want to setup host cross dev environment for
30# valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries 30# valid values are: powerpc, mips, arm, x86, x86_64 with space separation between entries
31YOCTOADT_TARGETS="arm x86" 31YOCTOADT_TARGETS="arm x86"
32# Whether install qemu or not, valid entries are: Y/N 32# Whether install qemu or not, valid entries are: Y/N
33YOCTOADT_QEMU="Y" 33YOCTOADT_QEMU="Y"
@@ -40,7 +40,7 @@ YOCTOADT_NFS_UTIL="Y"
40 40
41#The followings are for setting up specific target architecture 41#The followings are for setting up specific target architecture
42#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 42#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
43YOCTOADT_ROOTFS_arm="minimal" 43YOCTOADT_ROOTFS_arm="minimal sato-sdk"
44#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 44#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
45YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" 45YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal"
46#The location where the target sysroot will be setup 46#The location where the target sysroot will be setup
@@ -50,16 +50,3 @@ YOCTOADT_TARGET_SYSROOT_LOC_arm="$HOME/test-yocto/arm"
50#YOCTOADT_ROOTFS_x86="sato-sdk" 50#YOCTOADT_ROOTFS_x86="sato-sdk"
51#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk" 51#YOCTOADT_TARGET_SYSROOT_IMAGE_x86="sato-sdk"
52#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86" 52#YOCTOADT_TARGET_SYSROOT_LOC_x86="$HOME/test-yocto/x86"
53
54#Here's some template of other arches, which you need to change the value in ""
55#YOCTOADT_TARGET_SYSROOT_IMAGE_x86_64=""
56#YOCTOADT_TARGET_SYSROOT_LOC_x86_64=""
57#YOCTOADT_ROOTFS_x86_64=""
58
59#YOCTOADT_TARGET_SYSROOT_IMAGE_powerpc=""
60#YOCTOADT_TARGET_SYSROOT_LOC_powerpc=""
61#YOCTOADT_ROOTFS_powerpc=""
62
63#YOCTOADT_TARGET_SYSROOT_IMAGE_mips=""
64#YOCTOADT_TARGET_SYSROOT_LOC_mips=""
65#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 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"