diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2013-06-26 12:38:48 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-09 10:53:56 +0100 |
commit | d207bebb74b53dc1ad9e5a9f7a9f4fbe42760725 (patch) | |
tree | 222c0120f35c5f5ef7d1fd142fdfddcf20315877 /meta/recipes-devtools | |
parent | 73cdce8936d80b4115b7dac203cacaf3f99b6bbf (diff) | |
download | poky-d207bebb74b53dc1ad9e5a9f7a9f4fbe42760725.tar.gz |
adt_installer_internal:add sudo when permission deny on installation directory
When the user doesn't have rights to access the installation directory,
the sdk installation will fail, add sudo to fix this.
[YOCTO #4760]
(From OE-Core master rev: 040010d04672c93f18d60308ecf3c26a26ec5fd3)
(From OE-Core rev: dfca7cac51459764e12f08b7be0ced59ac4544c1)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rwxr-xr-x | meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal index 16677e71f1..175d285f4a 100755 --- a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal +++ b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal | |||
@@ -199,7 +199,7 @@ escaped_sdkpath=$(echo $DEFAULT_INSTALL_FOLDER |sed -e "s:[\+\.]:\\\\\\\\\0:g") | |||
199 | 199 | ||
200 | # We don't change the script in-place since we may want the user to re-run | 200 | # We don't change the script in-place since we may want the user to re-run |
201 | # adt-installer script | 201 | # adt-installer script |
202 | $SUDO sed -e "s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:" scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py | 202 | $SUDO sh -c "sed -e '"s:##DEFAULT_INSTALL_DIR##:$escaped_sdkpath:"' scripts/relocate_sdk.py > scripts/relocate_sdk_tmp.py" |
203 | $SUDO chmod +x scripts/relocate_sdk_tmp.py | 203 | $SUDO chmod +x scripts/relocate_sdk_tmp.py |
204 | 204 | ||
205 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") | 205 | dl_path=$(find $OECORE_NATIVE_SYSROOT/lib -name "ld-linux*") |
@@ -258,7 +258,7 @@ qemu_type=`echo "$1" | sed -e 's/x86_64/x86-64/'` | |||
258 | sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" | 258 | sysroot_image_name="core-image-$target_sysroot_image-qemu$qemu_type.tar.bz2" |
259 | #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." | 259 | #echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..." |
260 | 260 | ||
261 | scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type | 261 | $SUDO scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type |
262 | check_result | 262 | check_result |
263 | 263 | ||
264 | echo_info "Updating environment script with target sysroot location." | 264 | echo_info "Updating environment script with target sysroot location." |