diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-20 23:56:28 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-21 00:29:32 +0100 |
commit | 6af27de9363dbab8a96a29aeb4e87b8e40099f5d (patch) | |
tree | 02a24679bf06605baf2139c8432995c9bf43339b | |
parent | fc2cee5cc6299a5592af598c23a13f93bab1e5c8 (diff) | |
download | poky-6af27de9363dbab8a96a29aeb4e87b8e40099f5d.tar.gz |
adt_installer_internal: Remove hardcoded Poky references
(From OE-Core rev: 372f8c841f715d9e21e7cef4fd4106f1559795a8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 6 |
1 files changed, 3 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 7e76cc0744..8d4e01b881 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-pokysdk-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-pokysdk-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!" |
@@ -68,7 +68,7 @@ OPKG_LOCK_DIR="$NATIVE_INSTALL_DIR/$OPKG_LIBDIR/opkg" | |||
68 | if [ ! -d "$OPKG_LOCK_DIR" ]; then | 68 | if [ ! -d "$OPKG_LOCK_DIR" ]; then |
69 | sudo mkdir -p $OPKG_LOCK_DIR | 69 | sudo mkdir -p $OPKG_LOCK_DIR |
70 | echo_info "Successfully create directory $OPKG_LOCK_DIR. " | 70 | echo_info "Successfully create directory $OPKG_LOCK_DIR. " |
71 | #if user delete /opt/poky, while dangling folders there, report error | 71 | #if user delete /opt/xxx, while dangling folders there, report error |
72 | elif [ ! -d "$INSTALL_FOLDER" ]; then | 72 | elif [ ! -d "$INSTALL_FOLDER" ]; then |
73 | echo_info "\nDangling opkg cache folder $OPKG_LOCK_DIR detected. Continue installation will remove the folder!" | 73 | echo_info "\nDangling opkg cache folder $OPKG_LOCK_DIR detected. Continue installation will remove the folder!" |
74 | confirm_install $1 | 74 | confirm_install $1 |