summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:56:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:56:28 +0100
commit372f8c841f715d9e21e7cef4fd4106f1559795a8 (patch)
treef00830c484ea5d8ba4f22fdb6f4c8c6e569f6469
parent73a227a738da17229baac142ccd889c7929402ba (diff)
downloadopenembedded-core-372f8c841f715d9e21e7cef4fd4106f1559795a8.tar.gz
openembedded-core-372f8c841f715d9e21e7cef4fd4106f1559795a8.tar.bz2
openembedded-core-372f8c841f715d9e21e7cef4fd4106f1559795a8.zip
adt_installer_internal: Remove hardcoded Poky references
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xmeta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal6
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()
case $INST_ARCH in
i[3-6]86)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_32
- OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-pokysdk-linux/"
+ OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/$INST_ARCH-${SDK_VENDOR}-linux/"
;;
x86_64)
OPKG_CONFIG_FILE=$YOCTOADT_OPKG_CONF_FILE_64
- OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-pokysdk-linux/"
+ OECORE_NATIVE_SYSROOT="$INSTALL_FOLDER/sysroots/x86_64-${SDK_VENDOR}-linux/"
;;
*)
echo_info "[ADT_INST] Error: Installation Machine is not supported!"
@@ -68,7 +68,7 @@ OPKG_LOCK_DIR="$NATIVE_INSTALL_DIR/$OPKG_LIBDIR/opkg"
if [ ! -d "$OPKG_LOCK_DIR" ]; then
sudo mkdir -p $OPKG_LOCK_DIR
echo_info "Successfully create directory $OPKG_LOCK_DIR. "
-#if user delete /opt/poky, while dangling folders there, report error
+#if user delete /opt/xxx, while dangling folders there, report error
elif [ ! -d "$INSTALL_FOLDER" ]; then
echo_info "\nDangling opkg cache folder $OPKG_LOCK_DIR detected. Continue installation will remove the folder!"
confirm_install $1