diff options
Diffstat (limited to 'meta/recipes-devtools/installer/adt-installer/scripts')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/installer/adt-installer/scripts/data_define | 1 |
2 files changed, 2 insertions, 3 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 8d4e01b881..870931e37b 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -29,11 +29,11 @@ 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 | OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-${SDK_VENDOR}-linux/" | 32 | OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH$SDK_VENDOR-linux/" |
33 | ;; | 33 | ;; |
34 | x86_64) | 34 | x86_64) |
35 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 | 35 | OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64 |
36 | OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-${SDK_VENDOR}-linux/" | 36 | OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64$SDK_VENDOR-linux/" |
37 | ;; | 37 | ;; |
38 | *) | 38 | *) |
39 | echo_info "[ADT_INST] Error: Installation Machine is not supported!" | 39 | echo_info "[ADT_INST] Error: Installation Machine is not supported!" |
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/data_define b/meta/recipes-devtools/installer/adt-installer/scripts/data_define index ca1d47c883..2781e77032 100644 --- a/meta/recipes-devtools/installer/adt-installer/scripts/data_define +++ b/meta/recipes-devtools/installer/adt-installer/scripts/data_define | |||
@@ -37,4 +37,3 @@ YOCTOADT_SUPPORTED_TARGETS="x86 x86_64 arm ppc mips" | |||
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" |
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 | ||