sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

adt-installer: check if sudo is needed when installing target sysroot 

Currently, if SDK is installed in a directory that needs sudo
preivileges, the target sysroot is also installed with sudo, even though
the location is in users's home directory.

This patch reuses the ownership checking code and uses it to check if
sudo is needed for target sysroot too.

[YOCTO #5259]

(From OE-Core rev: 5acfced041477d8c272485196e87ad601a0ce5b4)

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 2013-09-25 15:40:28 +00:00 committed by Richard Purdie
parent 2f8ce2c784
commit 1ffa203dd5
1 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
View File

@ -42,6 +42,28 @@ parse_config()
esac
}
get_sudo_app()
{
username=$(id -nu)
# find the owner of the parent
dir=$1
while [ 1 ]; do
if [ -d $dir ]; then
owner=$(stat -c %U $dir)
break
else
dir=$(dirname $dir)
fi
done
if [ "$owner" = "$username" ]; then
true
else
echo sudo
fi
}
#let us install a qemu-native firstly
#installation step 2
@ -60,26 +82,11 @@ fi
#Now begin to install native sdk and extract qemu rootfs which needs privilege rights
#depending on the install location
username=$(id -nu)
# find the owner of the parent
dir=$NATIVE_INSTALL_DIR
while [ 1 ]; do
if [ -d $dir ]; then
owner=$(stat -c %U $dir)
break
else
dir=$(dirname $dir)
fi
done
if [ "$owner" = "$username" ]; then
SUDO=""
else
echo_info "#######################################################################"
echo_info "Please note from this point on installation requires sudo password ..."
echo_info "#######################################################################"
SUDO=sudo
SUDO=$(get_sudo_app $NATIVE_INSTALL_DIR)
if [ -n "$SUDO" ]; then
echo_info "#######################################################################"
echo_info "Please note from this point on installation requires sudo password ..."
echo_info "#######################################################################"
fi
#we need to make this directory firstly since opkg need to use it.
@ -249,6 +256,9 @@ target_machine=`eval echo $target_machine_var`
sysroot_image_name="core-image-$target_sysroot_image-$target_machine.tar.bz2"
#echo_info "Extracting rootfs: $sysroot_image_name, using pseudo..."
# sudo password might be needed to install the target sysroot
SUDO=$(get_sudo_app $target_sysroot)
$SUDO scripts/extract_rootfs $sysroot_image_name $target_sysroot $OECORE_NATIVE_SYSROOT $user_inst_type
check_result
@ -260,6 +270,7 @@ else
fi
if [ ! -z "$env_filename" ]; then
SUDO=$(get_sudo_app $INSTALL_FOLDER)
$SUDO sed -i -e "s%##SDKTARGETSYSROOT##%$target_sysroot%g" $env_filename
else
echo_info "[ADT_INST] Error: Failed to find environment script for arch: $1"