mirror of
https://git.yoctoproject.org/poky
synced 2026-05-04 22:39:49 +02:00
4421e0969d
The toolchain-shar-extract.sh script updates the SDK relocation paths in
post-relocate-setup.sh, so avoid doing this twice. This is generally not
a problem, unless the SDK path is a subset of the SDK relocation path, in
which case the resulting path is substituted twice. To trigger the issue,
$ ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-base-core2-64-qemux86-64-toolchain-3.2+snapshot.sh -y -d /home/oe/.local/opt/poky/3.2+snapshot
which generates relocation path
/home/oe/.local/home/oe/.local/opt/poky/3.2+snapshot
instead of
/home/oe/.local/opt/poky/3.2+snapshot
Fixes: 93ec145f42 ("toolchain-shar-extract: Add post-relocate scripts")
(From OE-Core rev: 5000aabe6ac336e7b424dafa1bf76271dee6a6f1)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Joshua Watt <JPEWhacker@gmail.com>
Cc: Krzysztof Zawadzki <krzysztof.zawadzki@nokia.com>
Cc: Randy Witt <randy.e.witt@linux.intel.com>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
83 lines
2.6 KiB
Bash
83 lines
2.6 KiB
Bash
if ! xargs --version > /dev/null 2>&1; then
|
|
echo "xargs is required by the relocation script, please install it first. Abort!"
|
|
exit 1
|
|
fi
|
|
|
|
# fix dynamic loader paths in all ELF SDK binaries
|
|
native_sysroot=$($SUDO_EXEC cat $env_setup_script |grep 'OECORE_NATIVE_SYSROOT='|cut -d'=' -f2|tr -d '"')
|
|
dl_path=$($SUDO_EXEC find $native_sysroot/lib -name "ld-linux*")
|
|
if [ "$dl_path" = "" ] ; then
|
|
echo "SDK could not be set up. Relocate script unable to find ld-linux.so. Abort!"
|
|
exit 1
|
|
fi
|
|
executable_files=$($SUDO_EXEC find $native_sysroot -type f \
|
|
\( -perm -0100 -o -perm -0010 -o -perm -0001 \) -printf "'%h/%f' ")
|
|
if [ "x$executable_files" = "x" ]; then
|
|
echo "SDK relocate failed, could not get executalbe files"
|
|
exit 1
|
|
fi
|
|
|
|
tdir=`mktemp -d`
|
|
if [ x$tdir = x ] ; then
|
|
echo "SDK relocate failed, could not create a temporary directory"
|
|
exit 1
|
|
fi
|
|
cat <<EOF >> $tdir/relocate_sdk.sh
|
|
#!/bin/sh
|
|
for py in python python2 python3
|
|
do
|
|
PYTHON=\`which \${py} 2>/dev/null\`
|
|
if [ \$? -eq 0 ]; then
|
|
break;
|
|
fi
|
|
done
|
|
|
|
if [ x\${PYTHON} = "x" ]; then
|
|
echo "SDK could not be relocated. No python found."
|
|
exit 1
|
|
fi
|
|
\${PYTHON} ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files
|
|
EOF
|
|
|
|
$SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh
|
|
$SUDO_EXEC chmod 755 ${env_setup_script%/*}/relocate_sdk.sh
|
|
rm -rf $tdir
|
|
if [ $relocate = 1 ] ; then
|
|
$SUDO_EXEC ${env_setup_script%/*}/relocate_sdk.sh
|
|
if [ $? -ne 0 ]; then
|
|
echo "SDK could not be set up. Relocate script failed. Abort!"
|
|
exit 1
|
|
fi
|
|
fi
|
|
|
|
# replace @SDKPATH@ with the new prefix in all text files: configs/scripts/etc.
|
|
# replace the host perl with SDK perl.
|
|
for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do
|
|
$SUDO_EXEC find $replace -type f
|
|
done | xargs -n100 file | grep ":.*\(ASCII\|script\|source\).*text" | \
|
|
awk -F':' '{printf "\"%s\"\n", $1}' | \
|
|
grep -Fv -e "$target_sdk_dir/environment-setup-" \
|
|
-e "$target_sdk_dir/relocate_sdk" \
|
|
-e "$target_sdk_dir/post-relocate-setup" \
|
|
-e "$target_sdk_dir/${0##*/}" | \
|
|
xargs -n100 $SUDO_EXEC sed -i \
|
|
-e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" \
|
|
-e "s:^#! */usr/bin/perl.*:#! /usr/bin/env perl:g" \
|
|
-e "s: /usr/bin/perl: /usr/bin/env perl:g"
|
|
|
|
if [ $? -ne 0 ]; then
|
|
echo "Failed to replace perl. Relocate script failed. Abort!"
|
|
exit 1
|
|
fi
|
|
|
|
# change all symlinks pointing to @SDKPATH@
|
|
for l in $($SUDO_EXEC find $native_sysroot -type l); do
|
|
$SUDO_EXEC ln -sfn $(readlink $l|$SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:") $l
|
|
if [ $? -ne 0 ]; then
|
|
echo "Failed to setup symlinks. Relocate script failed. Abort!"
|
|
exit 1
|
|
fi
|
|
done
|
|
|
|
echo done
|