diff options
3 files changed, 17 insertions, 4 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer.conf b/meta/recipes-devtools/installer/adt-installer/adt_installer.conf index 0c93237ef1..e31f9afa1f 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: powerpc, mips, arm, x86, x86_64 with space separation between entries | 30 | # valid values are: arm, x86, x86_64, powerpc, mips with space separation between entries |
| 31 | YOCTOADT_TARGETS="arm x86" | 31 | YOCTOADT_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 |
| 33 | YOCTOADT_QEMU="Y" | 33 | YOCTOADT_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 |
| 43 | YOCTOADT_ROOTFS_arm="minimal sato-sdk" | 43 | YOCTOADT_ROOTFS_arm="minimal" |
| 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 |
| 45 | YOCTOADT_TARGET_SYSROOT_IMAGE_arm="minimal" | 45 | YOCTOADT_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,3 +50,16 @@ 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 870931e37b..c7de0e2969 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 | |||
| 105 | check_result | 105 | check_result |
| 106 | 106 | ||
| 107 | for native_target_type in $YOCTOADT_TARGETS; do | 107 | for native_target_type in $YOCTOADT_TARGETS; do |
| 108 | native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -e 's/ppc/powerpc/' -e 's/x86$/i586/'` | 108 | native_target_type=`echo "$native_target_type" | sed -e 's/x86_64/x86-64/' -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 2781e77032..1de21d770a 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 |
| 34 | YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" | 34 | YOCTOADT_SUPPORTED_ROOTFS="minimal minimal-dev sato sato-dev sato-sdk lsb lsb-dev lsb-sdk" |
| 35 | YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips" | 35 | YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc 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 |
| 38 | YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" | 38 | YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" |
