mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 05:09:24 +00:00
Code Issues Projects Releases Wiki Activity

SDK: fix installation into symlinked directories

Browse Source 
The SDK installation scripts should not canonicalize symlinked
directories because the entire relocation would be done to the directory
to which the symlink points. Instead, if the installation is a symlink,
use that path to relocate the binaries.

For example, if we have the following symlink: /opt/sdk -> ~/my/test/sdk
the binaries will be relocated to /opt/sdk not ~/my/test/sdk as it is
done now.

[YOCTO #3102]

(From OE-Core rev: 9e6a25e2e9a7f37c3baa0b2949a43ac4127868da)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Laurentiu Palcu
2012-09-17 11:19:08 +03:00
committed by Richard Purdie
parent b9bd372666
commit bd73a4b615
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/populate_sdk_base.bbclass
+6 -2
View File
@@ -126,7 +126,11 @@ if [ "$target_sdk_dir" = "" ]; then
fi
eval target_sdk_dir=$target_sdk_dir
target_sdk_dir=$(readlink -m $target_sdk_dir)
if [ -d $target_sdk_dir ]; then
target_sdk_dir=$(cd $target_sdk_dir; pwd)
else
target_sdk_dir=$(readlink -m $target_sdk_dir)
fi
printf "You are about to install Poky SDK to \"$target_sdk_dir\". Proceed[Y/n]?"
read answer
@@ -154,7 +158,7 @@ echo "done"
printf "Setting it up..."
# fix environment paths
env_setup_script=$(find $target_sdk_dir -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}")
env_setup_script=$(find $target_sdk_dir/ -name "environment-setup-${REAL_MULTIMACH_TARGET_SYS}")
sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script
# fix dynamic loader paths in all ELF SDK binaries
meta/recipes-devtools/installer/adt-installer/adt_installer
+5 -1
View File
@@ -340,7 +340,11 @@ if [ "$INSTALL_FOLDER" = "" ]; then
fi
eval INSTALL_FOLDER=$INSTALL_FOLDER
export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER)
if [ -d $INSTALL_FOLDER ]; then
export INSTALL_FOLDER=$(cd $INSTALL_FOLDER; pwd)
else
export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER)
fi
clear
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+1 -1
View File
@@ -207,7 +207,7 @@ $SUDO scripts/relocate_sdk_tmp.py $INSTALL_FOLDER $dl_path $executable_files
check_result
# replace /opt/${DISTRO}/${SDK_VERSION} with the install folder in all configs
env_setup_script=$(find $NATIVE_INSTALL_DIR -name "environment-setup-*")
env_setup_script=$(find $NATIVE_INSTALL_DIR/ -name "environment-setup-*")
$SUDO sed -i -e "s:$DEFAULT_INSTALL_FOLDER:$NATIVE_INSTALL_DIR:g" $env_setup_script
find $OECORE_NATIVE_SYSROOT -type f -exec file '{}' \;|grep ":.*ASCII.*text"|cut -d':' -f1|\