diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-09 11:18:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-09 11:18:13 +0000 |
commit | 092f132a472f16415b224ea1d855e00f87954232 (patch) | |
tree | 75331c3ba274ce1bf3d43e3ff50615105541eb0d /meta/recipes-devtools/installer/adt-installer/scripts | |
parent | ad987ff0f32aa50558f08c72544054757a323132 (diff) | |
parent | 4ed19cfd21e455d57569ce06dd51b1b0e8860c77 (diff) | |
download | ast2050-yocto-poky-092f132a472f16415b224ea1d855e00f87954232.zip ast2050-yocto-poky-092f132a472f16415b224ea1d855e00f87954232.tar.gz |
Merge branch 'jzhang/adt-repo' of ssh://git.pokylinux.org/poky-contrib
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 3 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer/scripts/data_define | 2 |
2 files changed, 3 insertions, 2 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 78e5c97..9653284 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,8 @@ parse_config() case $INST_ARCH in i[3-6]86) OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 - POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" + #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" + POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" ;; x86_64) OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index e975077..2895c4f 100644 --- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define +++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define @@ -35,6 +35,6 @@ YOCTOADT_SUPPORTED_ROOTFS="minimal sato sdk lsb" YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc mips" # Different host (32 bit or 64 bit) will have different opkg # configuration files -YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i586.conf" +YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf" INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION |