diff options
| author | Liam R. Howlett <Liam.Howlett@windriver.com> | 2016-01-19 15:20:17 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-22 23:42:37 +0000 |
| commit | 99d4d97f51b658d58a50789056b422e48df89ad9 (patch) | |
| tree | 0936072ce99a55fdf94392dc71241fa305e4bf76 /meta/files | |
| parent | 9f6942524b1b1bf028f4176e4549acd583a69762 (diff) | |
| download | openembedded-core-99d4d97f51b658d58a50789056b422e48df89ad9.tar.gz openembedded-core-99d4d97f51b658d58a50789056b422e48df89ad9.tar.bz2 openembedded-core-99d4d97f51b658d58a50789056b422e48df89ad9.zip | |
meta/files/toolchain-shar-relocate.sh: Detect different python binaries and select one that exists.
Although the relocate_sdk.sh supports python3, fc23 does not symlink
/usr/bin/python3 to /usr/bin/python. Using exec instead of a call to
the correct interpreter causes a failure on fc23 when python2 is not
present. This uses 'which' to locate python, python2, then python3 and
uses the first one that's found.
Signed-off-by: Liam R. Howlett <Liam.Howlett@WindRiver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/files')
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index 4ef2927171..4f34fb4bfb 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh @@ -13,8 +13,23 @@ if [ x$tdir = x ] ; then echo "SDK relocate failed, could not create a temporary directory" exit 1 fi -echo "#!/bin/bash" > $tdir/relocate_sdk.sh -echo exec ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files >> $tdir/relocate_sdk.sh +cat <<EOF >> $tdir/relocate_sdk.sh +#!/bin/bash +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 |