diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-25 16:45:23 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-25 16:46:56 +0100 |
| commit | d8762a1ea74bbd9a9ee1510fe5ffa8db1b7d0d61 (patch) | |
| tree | 86cc816ce37adccfc5bc4fad83d0a156a176b69f /meta/files | |
| parent | dafacf04532fa46201a2c7cce8a217d656131e18 (diff) | |
| download | poky-d8762a1ea74bbd9a9ee1510fe5ffa8db1b7d0d61.tar.gz | |
Revert "relocate_sdk.py: remove hardcoded SDK path"
This reverts commit 6671a4d980c8bef8f402780a308f6c43a25044aa.
This breaks uninative tarball since the call of relocate_sdk.py from uninative.bbclass
wasn't updated to account for this change. It isn't clear what value that code could
pass in and this isn't simple to fix so revert until a better fix can be found
that doesn't break uninative.
(From OE-Core rev: b247392b4ced57cfe694656032f6a6723740a9e8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files')
| -rw-r--r-- | meta/files/toolchain-shar-relocate.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/files/toolchain-shar-relocate.sh b/meta/files/toolchain-shar-relocate.sh index f82ff2be48..e3c10018ef 100644 --- a/meta/files/toolchain-shar-relocate.sh +++ b/meta/files/toolchain-shar-relocate.sh | |||
| @@ -36,7 +36,7 @@ if [ x\${PYTHON} = "x" ]; then | |||
| 36 | echo "SDK could not be relocated. No python found." | 36 | echo "SDK could not be relocated. No python found." |
| 37 | exit 1 | 37 | exit 1 |
| 38 | fi | 38 | fi |
| 39 | \${PYTHON} ${env_setup_script%/*}/relocate_sdk.py $DEFAULT_INSTALL_DIR $target_sdk_dir $dl_path $executable_files | 39 | \${PYTHON} ${env_setup_script%/*}/relocate_sdk.py $target_sdk_dir $dl_path $executable_files |
| 40 | EOF | 40 | EOF |
| 41 | 41 | ||
| 42 | $SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh | 42 | $SUDO_EXEC mv $tdir/relocate_sdk.sh ${env_setup_script%/*}/relocate_sdk.sh |