mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-04 16:10:04 +00:00
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;
Cherry-pick commit b751ec137d
[YOCTO #3401]
(From OE-Core rev: c3b00f18f24c5ff48981ea3645a58cf48eaa94aa)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c84d6fb67d
commit
192d249b31
|
|
@ -132,11 +132,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
|
||||
|
|
@ -176,7 +185,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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user