diff options
author | Jessica Zhang <jessica.zhang@intel.com> | 2011-02-08 22:30:25 -0800 |
---|---|---|
committer | Jessica Zhang <jessica.zhang@intel.com> | 2011-02-08 23:10:13 -0800 |
commit | 4ed19cfd21e455d57569ce06dd51b1b0e8860c77 (patch) | |
tree | b3017402f40760f44c5c9789971a256dcdbbde3f /meta/recipes-devtools/installer/adt-installer/scripts | |
parent | 29ed2c6e9a0c3cc57c5bbaf3c53e1cff8586c51c (diff) | |
download | poky-4ed19cfd21e455d57569ce06dd51b1b0e8860c77.tar.gz |
adt-installer: change to adopt the adt public repo directory layout
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
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 78e5c97436..9653284e5a 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() | |||
29 | case $INST_ARCH in | 29 | case $INST_ARCH in |
30 | i[3-6]86) | 30 | i[3-6]86) |
31 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 | 31 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32 |
32 | POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" | 32 | #POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/i586-pokysdk-linux/" |
33 | POKY_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/" | ||
33 | ;; | 34 | ;; |
34 | x86_64) | 35 | x86_64) |
35 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 | 36 | 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 e975077ede..2895c4f188 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" | |||
35 | YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm powerpc 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-i586.conf" | 38 | YOCTOADT_OPKG_CONF_FILE_32="./opkg/conf/opkg-sdk-i686.conf" |
39 | YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf" | 39 | YOCTOADT_OPKG_CONF_FILE_64="./opkg/conf/opkg-sdk-x86_64.conf" |
40 | INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION | 40 | INSTALL_FOLDER=/opt/poky/$YOCTOADT_VERSION |