diff options
| author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2012-11-26 11:31:40 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 13:48:23 +0000 |
| commit | cd035f170a2448b9ebcf0cfac5d4c0fa472b7049 (patch) | |
| tree | fc1f8ca699bebffd6bd255d031cad3ca53cb2a07 /meta | |
| parent | 60ac9eccd6101967a89ab74344920b4b3ca8cd5f (diff) | |
| download | openembedded-core-cd035f170a2448b9ebcf0cfac5d4c0fa472b7049.tar.gz openembedded-core-cd035f170a2448b9ebcf0cfac5d4c0fa472b7049.tar.bz2 openembedded-core-cd035f170a2448b9ebcf0cfac5d4c0fa472b7049.zip | |
populate_sdk_base: tarball installer: SDK overwrite warning
This patch contains two fixes:
* if the user wants to install the SDK in a directory that already
contains a SDK for the same architecture, a warning will be shown;
* when the symbolic links are relocated use -n option. Otherwise,
symbolic links to existing directories will be created in the
directory itself;
[YOCTO #3401]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index ac34c32b52..f1fcde6f44 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -143,11 +143,20 @@ else target_sdk_dir=$(readlink -m $target_sdk_dir) fi -printf "You are about to install the SDK to \"$target_sdk_dir\". Proceed[Y/n]?" +if [ -e "$target_sdk_dir/environment-setup-${REAL_MULTIMACH_TARGET_SYS}" ]; then + echo "The directory \"$target_sdk_dir\" already contains a SDK for this architecture." + printf "If you continue, existing files will be overwritten! Proceed[y/N]?" + + default_answer="n" +else + printf "You are about to install the SDK to \"$target_sdk_dir\". Proceed[Y/n]?" + + default_answer="y" +fi read answer if [ "$answer" = "" ]; then - answer="y" + answer="$default_answer" fi if [ "$answer" != "Y" -a "$answer" != "y" ]; then @@ -188,7 +197,7 @@ find $native_sysroot -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' # change all symlinks pointing to ${SDKPATH} for l in $(find $native_sysroot -type l); do - ln -sf $(readlink $l|sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l + ln -sfn $(readlink $l|sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l done echo done |